Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 15 Feb 2016 11:16:53 +0000 (12:16 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 15 Feb 2016 11:16:53 +0000 (12:16 +0100)
commite858e535b2a88fff10678ea4fcf18e115150a04e
tree744db8903ca7aba25919ad13088d8b5fc9f5e7dd
parent65597a68b26564b7ef501748951b9ff779852ce7
parent4cacf9e75745b38f40b2d2aadc6c9ed72df9e866
Merge branch '2015.11' into 2015.11-develop
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Addressbook/js/ContactGrid.js