Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Mar 2016 11:44:53 +0000 (12:44 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Mar 2016 11:44:53 +0000 (12:44 +0100)
1  2 
tine20/Setup/Controller.php
tine20/Tinebase/js/widgets/dialog/EditDialog.js

Simple merge