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)
1  2 
classes/platal.php

Simple merge