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)
1  2 
tine20/Tinebase/User.php

Simple merge