Merge remote branch 'origin/xorg/maint' into xorg/master

Conflicts:
	templates/search/index.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --cc modules/search.php
Simple merge

diff --cc templates/admin/user.tpl
Simple merge

diff --cc templates/search/index.tpl
index b8988b3,f2e9a32..5470fee
--- 1/templates/search/index.tpl
--- 2/templates/search/index.tpl
+++ b/templates/search/index.tpl
@@@ -47,8 -47,8 +47,8 @@@
    {if $search_results_nb eq 1}{literal}
      <script type="text/javascript">
        // popup automatically if only one result
 -      $(document).ready(function() {
 +      $(function() {
-         $('#content a.popup2').click();
+         $('#content a.popup2').first().click();
        });
      </script>
    {/literal}{/if}