Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 7 Oct 2015 10:23:55 +0000 (12:23 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 7 Oct 2015 10:23:55 +0000 (12:23 +0200)
commitce90ac3a291bda665d63c81973ded7f877063b46
tree9263ddef1b1b6958ec5fc9ffc2f5fa487e704f4f
parent1a6bac4d1c4947d64bda70a51030d75300979d15
parent70dce5e0729c82a2798749eeb3ff9e7019554272
Merge branch '2014.11-develop' into 2015.07

Conflicts:
tests/tine20/TestCase.php

Change-Id: Ib71850dd223bee807b66730e2e5166d772e4ecb5
tests/tine20/TestCase.php
tests/tine20/Tinebase/Frontend/CliTest.php