Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 7 Sep 2015 15:48:48 +0000 (17:48 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 7 Sep 2015 15:48:48 +0000 (17:48 +0200)
commitb790f652b7d42b0ad5379ec0c218cc27400b137f
tree039236dba3833d8b24ec90afe6ae78cfb46e51ce
parent4a647d8f59a6365aceae35073defed1aecec3e73
parent9057c0fb6ae3f104790d6689c4b52ffac7a953b9
Merge branch '2014.11' into 2014.11-develop
tine20/Tinebase/User.php