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)
commitc8d52a932d828eb924df84bdfcb65d08ad7ca200
treea22ec54a561dcfeeec809d228906d642de3c4e20
parent54a4ed941b62d8f9386847647df26c07402fbe84
parent12521811835fce5a8fb98f79f7876adc6178b5bd
Merge branch '2014.11' into 2014.11-develop
tests/tine20/Sales/InvoiceControllerTests.php
tine20/Calendar/Controller/Event.php