Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Nov 2015 12:30:39 +0000 (13:30 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Nov 2015 12:30:39 +0000 (13:30 +0100)
commit9b55f23a57cff274dd8b42d66606b4c66f455b46
treeea8ee7a80177bbeb813fc9f4b6849161edf1a88f
parentc84b02ea3a7685776af28cb4f47e0f5884edfd60
parentaa53e20b59b09516fe7087c4699a19f27d2eab39
Merge branch '2013.10' into 2014.11
tine20/Tinebase/User.php