# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 * include upstream change
 * added dropdowns

previously it never returned any users

Mediamanager: rename radio name attributes for sort and list buttons to

fix fs#2851
related to http://bugs.jqueryui.com/ticket/8761

using http://cleancss.com/

Add Apache module list to ?do=debug information

This should make it possible to see if mod_security is involved,
at least on servers running mod_php.

Yes, it's hiding $auth, but detail templates might depend on that. We
need to fix this properly.

This reverts commit 343aa174.

* pull-request-524:
  authldap: handle bad groupkey gracefully
  Update auth.php
  Update auth.php