Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 14 Mar 2016 12:51:20 +0000 (13:51 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 14 Mar 2016 12:51:20 +0000 (13:51 +0100)
commit1da9295cd02a4013731661bd86fdc801eaefb66c
tree6e6ce6290f7c5b5af0584b6e54b748439e8d36ed
parent17138d4f979a669eedc9d10240ec3f10eeb4ec12
parent8c1fbf4b17b55e56edcf941b102ee269c864a4d3
Merge branch '2015.11' into 2015.11-develop

Conflicts:
tests/tine20/TestCase.php

Change-Id: Ib06a5152b691fdb5ca766f8895e7b109884c92db
tests/tine20/Calendar/Controller/EventTests.php
tests/tine20/Felamimail/Frontend/JsonTest.php
tests/tine20/Sales/InvoiceControllerTests.php
tests/tine20/Sales/InvoiceJsonTests.php
tests/tine20/TestCase.php