Merge remote branch 'origin/core/1.1.2/maint' into core/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 16 Feb 2011 21:17:19 +0000 (22:17 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 16 Feb 2011 21:17:19 +0000 (22:17 +0100)
1  2 
classes/plpage.php

Simple merge