Merge branch 'master' into osoetraining
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 11 Jul 2011 13:28:17 +0000 (15:28 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 11 Jul 2011 13:28:17 +0000 (15:28 +0200)
commitc32f42e6d85d66260e9a614a92d0c8f286197e10
treed95c38413fd19e005be9c38de1c9ed3f6f1fc842
parentdb190d40666e54150d81f1529ea247413fda6033
parentc7d6ebff890b1b584543b6529c637640e8becd81
Merge branch 'master' into osoetraining