Merge branch 'osoetraining'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 6 Sep 2011 14:12:06 +0000 (16:12 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 6 Sep 2011 14:12:06 +0000 (16:12 +0200)
commit27a84fdb511ddb442004d3ddcd0ea44347e13d3d
treeddc3d48d9edaeb0f287311e2ef8562b85249f3fc
parentb02fb1ace0306c40730a95cc8949c0682c6d738a
parentebc41698cdb486414a66ebdba56a2a9a4a5de1fd
Merge branch 'osoetraining'
setup.py