Merge branch 'platal-1.0.0'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 1 Jul 2010 08:35:43 +0000 (10:35 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 1 Jul 2010 08:35:43 +0000 (10:35 +0200)
commit77d4417766e20c5b2b33613f1198893d470ba6b2
tree91efc1748e044605bda475b87a794a7ea34f68dc
parentc710b211c16d68c00b9389515cdc014650ff0f29
parentf1b2f9f7939c9edaae97901e9b55ff1047e34e2e
Merge branch 'platal-1.0.0'