Merge commit 'origin/core-1.0.0' into core
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 18 Dec 2008 22:31:25 +0000 (23:31 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 18 Dec 2008 22:31:25 +0000 (23:31 +0100)
commite33badaa2e54d255a8ef5fc9e33c797349b7ca17
tree8ca23920c688ce3ea96cd60df13ef25562da2210
parenteec996233a443d9d024786583c0370a54d639dde
parent4f67da27edb0f631a7af1ccf5aa6e7ead84332dc
Merge commit 'origin/core-1.0.0' into core