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)
Change-Id: Ie7a83dac93ab08b54cd0c455a50496febed5b0aa

1  2 
tine20/Calendar/Frontend/WebDAV/Container.php
tine20/Setup/Frontend/Cli.php

Simple merge