Merge commit 'origin/core-1.0.0' into core
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 21 Dec 2008 14:48:31 +0000 (15:48 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 21 Dec 2008 14:48:31 +0000 (15:48 +0100)
commitd7dfb18e275c1ed834ea8f0f4001399b0a17ce9f
treec57f5d31ff563ecb8a69297ffeecfd474e8a4fec
parent9ca0abdd001bbf5dcda5aaa66b7b2b2073c865b9
parenta12a0ce3c524c4edabcbb0e872fbc84fc3bad498
Merge commit 'origin/core-1.0.0' into core