Merge branch '2013.10' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 31 Oct 2014 10:53:04 +0000 (11:53 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 31 Oct 2014 10:53:04 +0000 (11:53 +0100)
commit73c3e67f8e9f50159b7cbc86311579157e2c250b
treef251d77c5c85edc3d834fcc04001bcd46a0ed0a5
parentcfc26c160a61e56cdda65cfab61f9b1cc2a23d14
parent276cbe033a04bab4157f32ef33f2660317cae446
Merge branch '2013.10' into 2014.09

Conflicts:
tine20/Calendar/Frontend/WebDAV.php

Change-Id: I89a0fddc04ee0c60386275f7f2e0908a06bb0a93
tine20/Calendar/Frontend/WebDAV.php
tine20/Calendar/js/Model.js
tine20/Tinebase/js/ApplicationStarter.js