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

* 'toolbar' of git://github.com/hafron/dokuwiki:
  megre changes
  add preventDefault to toolbar buttons

added bin/gittool.php for simpler git management of plugins

dw_qsearch as jQuery function

fix TestRequest

* 'master' of git://github.com/SteScho/dokuwiki:
  Update auth.php
  Update auth.php

MSIE 11 tries hard to break any previous working browser detection
even through feature checks. This resolves to browser sniffing (MSIE for
old IE, Trident for IE11+)

See https://forum.dokuwiki.org/thread/10824

Translation update (fr)

if a needed CONNECT tunnel fails

Translation update (hu-formal)

Translation update (bn)

connections are now retried after timeout and failing connections will
be marked as skipped instead of failing. This should reduce false alarms
on travis

Let's stop confusing people with what this button does

Makes use of the extension plugin

Translation update (sl)

Translation update (sl)

add test case new Input check
add global variables to execute

As suggested by @selfthinker

localize jQuery UI date picker FS#2912

Added video and audio support

renamed conflicting JavaScript functions FS#2915

FS#2901: Fix lessphp on PHP 5.2.0

Add the original filename to sendFile for Content-Disposition

* origin/PR523:
  Update tpl_getConf() signature to match plugin::getConf()