Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 15 Sep 2016 08:08:45 +0000 (10:08 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 15 Sep 2016 08:08:45 +0000 (10:08 +0200)
commitda66569060fa9ef84868533e256a974ba3c99d50
treea8506f303d28e0ecd6397f2534b128820e6ee4d7
parent2fa75f6d25969e93060d43a567b21a280a7feb3a
parenta0d0689d328441452d55bda756497d6dc9ce80ea
Merge branch '2013.10' into 2014.11
tine20/Addressbook/Model/Contact.php
tine20/Tinebase/User.php