Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 4 Aug 2015 16:16:57 +0000 (18:16 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 4 Aug 2015 16:16:57 +0000 (18:16 +0200)
1  2 
tine20/Tinebase/Auth.php
tine20/Tinebase/Ldap.php
tine20/Tinebase/User.php

Simple merge
Simple merge
Simple merge