Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Feb 2016 09:39:13 +0000 (10:39 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Feb 2016 09:39:13 +0000 (10:39 +0100)
Conflicts:
tine20/Tinebase/Model/Filter/Abstract.php
tine20/Tinebase/Model/Filter/Query.php

Change-Id: If53d179d7242ea0b30935a61282ec6bb287ce9f3

1  2 
tine20/Calendar/js/Model.js
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Timemachine/ModificationLog.php

Simple merge