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)
commit0bab013f04b3c32fb8a759498e002e3f2e81d598
tree3d350fa4f6b11b4e05eb5300b9ec761a6e9b5c8b
parent07aac1b388b114b949f746f59d3fdf634c60ddea
parent665467dc495cd7bdefe948ba8b7225f6aa9ab4e5
Merge branch '2015.11-ldap' into 2015.11