Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 12 Sep 2016 12:19:22 +0000 (14:19 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 12 Sep 2016 12:19:22 +0000 (14:19 +0200)
1  2 
tine20/Tinebase/Convert/Json.php

Simple merge