Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Jan 2016 14:02:20 +0000 (15:02 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Jan 2016 14:02:20 +0000 (15:02 +0100)
1  2 
tests/tine20/Sales/InvoiceControllerTests.php
tine20/Calendar/Controller/Event.php

Simple merge