Merge branch '2016.11-develop-ldap' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 19 Jun 2017 10:55:21 +0000 (12:55 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 19 Jun 2017 10:55:21 +0000 (12:55 +0200)
commitb60c6dc712f9846e97aa0c3626c46f9f9a0ae88d
tree5deebabaf0229f35dbad852f8c9062a2b70157e9
parent9091383ffb645a10629f1e8d4157ca8b23a9ad10
parentf29a79e43d0e7efdad195d2ea6646c7a79f5a7a0
Merge branch '2016.11-develop-ldap' into 2016.11-develop