Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Feb 2017 15:29:45 +0000 (16:29 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Feb 2017 15:29:45 +0000 (16:29 +0100)
commit34cd98c77959a78f837c41cdefeb0ddfe2e2fa34
tree42c60645e455a0ec548722ea69e29a0581dc084a
parent4f04eeabb2589e03a68f7658b4967af150b226c2
parentdd315e4d216d4bc9501c89c7bf8f0fa669056420
Merge branch '2016.11' into 2016.11-develop

Change-Id: I1adbbec4955550e8f56780539e3e424c7b8d8680
tine20/Addressbook/Controller/Contact.php
tine20/Addressbook/Frontend/Cli.php
tine20/Tinebase/Controller/Record/Abstract.php