Merge commit 'origin/platal-0.10.0'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 20 Dec 2008 17:13:10 +0000 (18:13 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 20 Dec 2008 17:13:10 +0000 (18:13 +0100)
commit47fe1bc45bf78554c0861a083609ec5674e41481
treef49b8d6372cefd1a66382ffa54761c04f7b6da3c
parent49bbddef42c7f9f4b356784141e3985c111778b6
parent397daecba8ec5715debc43ab4a38beb89b39971c
Merge commit 'origin/platal-0.10.0'

Conflicts:

core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
core