Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 2 Dec 2010 21:05:10 +0000 (22:05 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 2 Dec 2010 21:05:10 +0000 (22:05 +0100)
1  2 
modules/admin.php

Simple merge