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)
commit2111d7f0684b177aa3fa6059f0384046d6994636
treeae412e3bb18ce27c9689bf27632d27cdebe32c7b
parent3b29304dd0901cadfc2742b32d5bc08f487b6f51
parentce88943312646cef5ac06be9c2605a1950b9912c
Merge branch '2014.11-develop' into 2015.11
tine20/Calendar/Controller/Event.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/js/widgets/dialog/EditDialog.js