Merge commit 'origin/platal-0.10.0'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 18 Dec 2008 22:32:12 +0000 (23:32 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 18 Dec 2008 22:32:12 +0000 (23:32 +0100)
commit49bbddef42c7f9f4b356784141e3985c111778b6
tree85182c52f6ced0ab796a8078e2c28a8b294b0b61
parent2f41039553d2137c094d58074d918f37f3a4534a
parent685794d2f0f57dbe9384facb48ec31b78d15641a
Merge commit 'origin/platal-0.10.0'

Conflicts:

core

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