Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 7 Mar 2016 14:52:39 +0000 (15:52 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 7 Mar 2016 14:52:39 +0000 (15:52 +0100)
1  2 
tine20/Tinebase/js/common.js
tine20/Tinebase/translations/de.po

Simple merge
Simple merge