Merge remote branch 'origin/xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Tue, 19 Apr 2011 14:56:48 +0000 (16:56 +0200)
committerStéphane Jacob <sj@m4x.org>
Tue, 19 Apr 2011 14:56:48 +0000 (16:56 +0200)
commitf9a8c549deebf96792c3ba423e01545dc7caf95b
treed201b6d7fd0ba9d899c8624cdd3b3786e2d24b21
parent6b6e4ff22259786d71d3c43736ccbd50e9d59d9b
parent0768c6d72cfc59857d4c63b71059fcdf06b9ddfe
Merge remote branch 'origin/xorg/maint' into xorg/master
modules/admin.php