Merge branch '2014.11' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 19 Aug 2016 07:46:54 +0000 (09:46 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 19 Aug 2016 07:46:54 +0000 (09:46 +0200)
commitf073444eb54e4ff8591608ab0ebdb5542ab93f3b
treeb274b11ede883a8753963c88ce251580cf5b2a3f
parentfd310a499f9beffa9d506cb89a33c906ca9e2593
parentcb2f4adaf868327291f6ad587e61d3746a091085
Merge branch '2014.11' into 2015.11

Change-Id: Ie7a83dac93ab08b54cd0c455a50496febed5b0aa
tine20/Calendar/Frontend/WebDAV/Container.php
tine20/Setup/Frontend/Cli.php