Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Feb 2016 09:33:57 +0000 (10:33 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Feb 2016 09:33:57 +0000 (10:33 +0100)
commit543f86f28fef8dac731cbf434f959dbbdf8fffa5
tree9173a9bdfcd814cf34fda440836b3449eede754b
parentb54926f5dd4b34ee5c7a3cef14d1b443035db678
parent2854ad7b00fa69330309ebf408d3c1b0b3419841
Merge branch '2014.11' into 2014.11-develop

Conflicts:
tine20/Calendar/js/Model.js

Change-Id: I8a239c5c794dab3a24c9508161b017159605cbc5
tine20/Calendar/Frontend/Json.php
tine20/Calendar/js/Model.js
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Timemachine/ModificationLog.php