Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 5 Nov 2015 10:14:02 +0000 (11:14 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 5 Nov 2015 10:14:02 +0000 (11:14 +0100)
commit4688f953390b740a7ebf515ee106046669b74612
tree6a3b42fc1d4e8bb15f61a5c26e67f2a0039dce02
parent18217916bb5c0259d1912cae114076701bd339e2
parent7c83cb6ccf4c21c73f0f003451cb9534ee7c37e6
Merge branch '2014.11' into 2014.11-develop
tine20/Tinebase/Container.php
tine20/Tinebase/Relation/Backend/Sql.php