Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 13 Jan 2016 12:25:25 +0000 (13:25 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 13 Jan 2016 12:25:25 +0000 (13:25 +0100)
commitebd43a181fd177e0a6e8dbf3f85b075f171baaea
tree3c649e8c5dcb8e2aa0105057c6593caab072c81b
parentd40012ab0425a9c9b76036c3e559c55be55f1412
parent1bf2509c51745a501722686712ed8301fb737e22
Merge branch '2014.11-develop' into 2015.11
tine20/Tinebase/Backend/Sql/Abstract.php
tine20/Tinebase/ModelConfiguration.php