Merge branch 'pu/2013.10-mailto' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Feb 2015 15:57:31 +0000 (16:57 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Feb 2015 15:57:31 +0000 (16:57 +0100)
1  2 
tine20/Tinebase/js/Application.js
tine20/Tinebase/js/common.js

Simple merge
Simple merge