Merge branch '2015.11-develop'
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 14 Mar 2016 12:56:51 +0000 (13:56 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 14 Mar 2016 12:56:51 +0000 (13:56 +0100)
commitc22128bdb5aba8e27e8b1a55ed229470ee5e38ad
tree6b35b56d6f1c73a92ad2c649f42c60a49e7636ad
parenta8d8ef9c48e95e2167415feddd6b5787c4275d50
parent1da9295cd02a4013731661bd86fdc801eaefb66c
Merge branch '2015.11-develop'
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Tinebase/Config/KeyField.php