Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Jan 2016 14:54:33 +0000 (15:54 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Jan 2016 14:54:33 +0000 (15:54 +0100)
Conflicts:
tine20/Calendar/Model/Attender.php

Change-Id: I66e5636cfbc94584f118aaf399c3b70ad8e62fef

1  2 
tine20/Calendar/Backend/Sql.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Model/Attender.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Frontend/Http.php

Simple merge
Simple merge
Simple merge
Simple merge