Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Mar 2016 10:01:25 +0000 (12:01 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Mar 2016 10:01:25 +0000 (12:01 +0200)
commit2e3c2e90d9dcb98dcd77635132d98174a1bbff75
treeb5ce532ce4b736e2b3d0930c26995dd8992258b0
parent53f00de20fbde83cbc0e41d40c28b6799da81570
parent109ab5b6f6868e32947b00e21ee5a5aeaf046324
Merge branch '2014.11' into 2014.11-develop
tine20/Addressbook/Controller.php
tine20/Tinebase/Controller/Record/Abstract.php