Merge branch '2014.11' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 15 Sep 2016 08:09:05 +0000 (10:09 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 15 Sep 2016 08:09:05 +0000 (10:09 +0200)
commit538c57d98e67579d618fa3d9a31b4f304ffd2bf8
treecdd279db2c7f046d76fbd5ed753dc795b1fb51b9
parent4e8c485f17d1e2128d44173f7e22b53f9932d6d8
parentda66569060fa9ef84868533e256a974ba3c99d50
Merge branch '2014.11' into 2015.11
tine20/Addressbook/Model/Contact.php
tine20/Tinebase/User.php