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)
commit9eb9c71bc79c86d6ba3d3a63c0c686db3b7352f0
tree45e195010907dac2758cc088ead1f7c54bf11ecf
parentd6cc3bb424f9ffedc762a0797998120e50dc1dff
parentd729264672805dcad2779707768867462ad6b95b
Merge branch '2015.11' into 2015.11-develop
tine20/Addressbook/Controller.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Export/Abstract.php
tine20/Tinebase/Model/Image.php