Merge branch 'master' into accords
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 9 Jul 2012 21:05:23 +0000 (23:05 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 9 Jul 2012 21:05:23 +0000 (23:05 +0200)
commitfbe88b46ccc61c87ab9ea8e1cb74e9bb1e000031
tree233baf48d743a0e7f6616fa53527124231d22b86
parent404b3f51c0c9cca5c361e515a45a98b4f7175d4d
parent64a82822edb2c5ff7a6cf1aa597d2cdc081dbe01
Merge branch 'master' into accords

Conflicts:
setup.py
setup.py