Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Jan 2016 14:48:48 +0000 (15:48 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Jan 2016 14:48:48 +0000 (15:48 +0100)
1  2 
tine20/Tinebase/User.php
tine20/Tinebase/js/ExceptionDialog.js

Simple merge
Simple merge