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)
1  2 
tine20/Addressbook/Controller.php
tine20/Tinebase/Controller/Record/Abstract.php

Simple merge