Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 17 Feb 2016 17:45:36 +0000 (18:45 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 17 Feb 2016 17:45:36 +0000 (18:45 +0100)
commitdccaa510db83882599d5f75668a0cc23afb99657
tree0382febd920ed28496b61ffd69b99128ca16c844
parente28932a73b4e75b7777727746d7cadd150a28fb8
parenta54ac16b0b4d32fe8ff88717f2c9b89f4d4411ff
Merge branch '2015.11' into 2015.11-develop

Conflicts:
tests/tine20/Addressbook/Export/DocTest.php
tine20/Tinebase/Export/Richtext/Doc.php

Change-Id: I4b2c05e5735b3b4876ca56d0f2eeb31a2078fa31
tests/tine20/Addressbook/Export/DocTest.php