Merge remote branch 'origin/core/1.1.1/maint' into core/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 16 Dec 2010 20:13:55 +0000 (21:13 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 16 Dec 2010 20:13:55 +0000 (21:13 +0100)
commit88541046480799a8d92eba186f22e22c0c64efb0
tree8d9f18c578de9affe6cc0f0573076cadf31a9a42
parentcb22cf2a3b34e4f263dcfb6b51396111f8d6b785
parent798c1f4b15f14569c1f37d848db93ec4f65518b6
Merge remote branch 'origin/core/1.1.1/maint' into core/master
classes/plpage.php
modules/core.php