Merge branch '2015.11-ldap' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Mar 2016 14:04:14 +0000 (15:04 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Mar 2016 14:04:14 +0000 (15:04 +0100)
commitb4823332d7202c719c7f0077d1251cca2498e4be
tree538338466312363b90122a03da9d989a416048d2
parent1211a84df9b770a6b6c9ebcd0bccce8f4604fc00
parentcd3d2c55338ef711232ba26437577bf2c875a726
Merge branch '2015.11-ldap' into 2015.11