Merge remote branch 'origin/xorg/maint' into xorg/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 6 Feb 2011 20:57:14 +0000 (21:57 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 6 Feb 2011 20:57:14 +0000 (21:57 +0100)
commita43cdc7aab599efc9ebc698e91c131d3a40d6bee
treeeb2908ae51ff6fd67f0410f9bca3e845ba3d04cd
parentf53d69bbe83e6a9f60bd20411d3b71a394776772
parent50f5e460f6705d22e6ea230d96744cfb9e4104ee
Merge remote branch 'origin/xorg/maint' into xorg/master

Conflicts:
templates/search/index.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
modules/search.php
templates/admin/user.tpl
templates/search/index.tpl