Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Mar 2016 10:02:02 +0000 (12:02 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Mar 2016 10:02:02 +0000 (12:02 +0200)
1  2 
tine20/Addressbook/Controller.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Export/Abstract.php
tine20/Tinebase/Model/Image.php

Simple merge
Simple merge
Simple merge