Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Jan 2016 16:21:36 +0000 (17:21 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Jan 2016 16:21:36 +0000 (17:21 +0100)
1  2 
tine20/Calendar/Controller/Event.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/js/widgets/dialog/EditDialog.js

Simple merge