Merge branch 'master' into grid-computing
authorAlain Takoudjou <talino@tiolive.com>
Tue, 11 Sep 2012 17:11:03 +0000 (19:11 +0200)
committerAlain Takoudjou <talino@tiolive.com>
Tue, 11 Sep 2012 17:11:03 +0000 (19:11 +0200)
commit2095d0144acbc13eab82dc9083e3fc239addfc22
tree49d82ea0841b957ae4a462dfac315bf4be321a7d
parentbe4302d8b636117dbc51eb79773d81396d1553e8
parented0005ca444090e1deb239f14ef038f5f68cc534
Merge branch 'master' into grid-computing

Conflicts:
setup.py
setup.py