Merge branch '2015.11-ldap' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Apr 2016 14:41:45 +0000 (16:41 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Apr 2016 14:41:45 +0000 (16:41 +0200)

Trivial merge