Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 7 Aug 2015 17:16:45 +0000 (19:16 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 7 Aug 2015 17:16:45 +0000 (19:16 +0200)
commit97cc03e94064e944f4a069f47b992dd62e1f42f3
treee4ae36719c1d731b175c8aa322794e6fc96f49ae
parentbcb43accfe117e72c62d00327e41b7cb78c573c9
parent34fe3c172c8f40351cecb09c589e15acb0559718
Merge branch '2014.11-develop' into 2015.07
tine20/Tinebase/Core.php