Merge branch 'pu/2013.10-ldap' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Jul 2014 16:09:23 +0000 (18:09 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Jul 2014 16:09:23 +0000 (18:09 +0200)

Trivial merge