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)
1  2 
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Tinebase/Config/KeyField.php

Simple merge