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

Simple merge
Simple merge