Merge remote branch 'origin/platal-1.0.1'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 26 Oct 2010 20:11:00 +0000 (22:11 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 26 Oct 2010 20:11:00 +0000 (22:11 +0200)
commit8127963d297fab1ccb03df8f69cc9ddcdc645036
treed3ce52fee5fcf946174c7e9a15469d6c8e3ae459
parentaabb817adfe803f869cf01ebede47cceb005544d
parentbd5e6f71ea4059638b84fa15cdcc1ef16d4bf8eb
Merge remote branch 'origin/platal-1.0.1'

Conflicts:
ChangeLog
core

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