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)
commite0568a48358b61950c646f08cd0152d07c5c16ed
treee48ad29df5c2195ee80e80b06cdb220e8b5fbc49
parent59131449860ec31736a4fbf82e4775d847526707
parent86fbef5ac77c05b7d9cde4f6c716426ff726157a
Merge branch '2014.11-develop' into 2015.11

Conflicts:
tine20/Calendar/Model/Attender.php

Change-Id: I66e5636cfbc94584f118aaf399c3b70ad8e62fef
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