Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Apr 2016 10:20:39 +0000 (12:20 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Apr 2016 10:20:39 +0000 (12:20 +0200)
commit80231e61df76fabbcad760a4e02845ea956cb0ba
treef0cb3026dd7a41bac03a8eb8617b72f179cc9c6f
parentfe344fd6e4d6d77d64dae01cebd455812f964ea2
parente166e2c48f1e82cfd251b47032ea7fd8827b6ed7
Merge branch '2015.11' into 2015.11-develop
tests/tine20/Felamimail/Frontend/JsonTest.php