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)
commit04aa952b2e573e485fdf9087244f760258d739f5
treeef9b9a47e4c84b7cd4b57b0decbe125693ab0465
parent672782130dd57388844bf180d352468f1f94df37
parentf8372acbe961f4c098f05b3efea4ef083aa086ec
Merge branch 'pu/2013.10-ldap' into 2013.10