Merge branch 'master' into osoetraining
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 8 Jul 2011 16:29:08 +0000 (18:29 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 8 Jul 2011 16:29:08 +0000 (18:29 +0200)
commit07e8885d160a45eaf456c606d1dbeeca3ef986df
tree1067050b93e8871d3bf93aafd6bfdb75f5807b2c
parentf388cb2039a5ce4cc056ff08c0adfd473473d3bf
parent584e3b70e4ea70266e4c30b2a8712058d2e04263
Merge branch 'master' into osoetraining