Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 2 Jan 2015 17:25:16 +0000 (18:25 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 2 Jan 2015 17:25:16 +0000 (18:25 +0100)
commitb8b1d8311e37f9d36a84fdb721fd6a757c17672a
tree89ffaf2553fa19aa4d301e58b9735224e2e057f5
parentd906ddca2fb02ea31f10a403a23c8671b3b11d36
parent61979a6b283064f66ba0f84d765e3c7878b79796
Merge branch '2013.10' into 2014.11
tine20/Admin/Controller/User.php
tine20/Tinebase/User.php