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)
commit7f7b00425f9cb2dc2a611cd1ca985813893d5bfe
treeed1f1b5a5363093092df62b582520f1b020635d8
parent4fad11800bb571cc996ca8291adb617d5da42098
parentbe281b3183a7db3c62697d3ab59cf38cb7bed1b0
Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master
modules/admin.php