Merge remote branch 'origin/core-1.1.0' into core
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 17 Sep 2010 12:34:24 +0000 (14:34 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 17 Sep 2010 12:34:24 +0000 (14:34 +0200)
commit7e001f68b7928d80ccf32b8a8bca55d304476d3e
tree5b57e9e92f7a72b15f1ac26a3d69bdbfb6138203
parentadf0fa2119688cf61ca23b7bc23b0730af702c6d
parent1b54ef260c1db3f94830fb6f9b1b13aeb9fcdb78
Merge remote branch 'origin/core-1.1.0' into core
classes/platal.php