Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 15 Feb 2016 11:16:28 +0000 (12:16 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 15 Feb 2016 11:16:28 +0000 (12:16 +0100)
commit4cacf9e75745b38f40b2d2aadc6c9ed72df9e866
treedf68f5bfb968af032c98b3056e5dd4cc640ee416
parent47a3703523d1067fb90a1d6c79aa05e40019fa12
parent657b41a6239f4801a54dbbd6deec6bee4dc723d5
Merge branch '2014.11-develop' into 2015.11

Conflicts:
tine20/Addressbook/js/ContactGrid.js

Change-Id: Icc36f634708854940beb29ff75a81e4e9b620d1e
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Addressbook/js/ContactGrid.js
tine20/Tinebase/Backend/Sql/Abstract.php