Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Jan 2016 14:48:40 +0000 (15:48 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Jan 2016 14:48:40 +0000 (15:48 +0100)
1  2 
tine20/Tinebase/User.php

Simple merge