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)
commit86fbef5ac77c05b7d9cde4f6c716426ff726157a
treef42dd03a3b8619f8cf65f21e2ef0b5fccec7a748
parent4fb3d24f9b782530d5faff5c25b8207e8bed6489
parent47faf43db3eea5e72e265eda37eb2854727d76cf
Merge branch '2014.11' into 2014.11-develop
tine20/Tinebase/User.php
tine20/Tinebase/js/ExceptionDialog.js