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)
commit47faf43db3eea5e72e265eda37eb2854727d76cf
treedfc2467c9b98bd55fe597f9326e8672c17fb94e0
parent12521811835fce5a8fb98f79f7876adc6178b5bd
parentf617cb2a0127386f99d61b8b715a82d448412427
Merge branch '2013.10' into 2014.11
tine20/Tinebase/User.php