Merge branch 'pu/2013.10-mailto' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 9 Dec 2014 14:36:34 +0000 (15:36 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 9 Dec 2014 14:36:34 +0000 (15:36 +0100)
commit635722f14af4778b550d5c55e50fc4beb7eadc14
treea7a89997bb8364e57e7a9cd768dea48de6b1e7e1
parent908b465835f70b64d39f4c1eeeeb3c95d2683725
parent7e39a08a1f962b850900a229b4f33d1561edfb2d
Merge branch 'pu/2013.10-mailto' into 2014.09

Conflicts:
tine20/Tinebase/js/MainMenu.js

Change-Id: I701c3cfdf21e1c351b6e055e3b6af459e4c20fe1
tine20/Tinebase/Tinebase.jsb2
tine20/Tinebase/js/ExceptionHandler.js
tine20/Tinebase/js/MainMenu.js
tine20/Tinebase/js/common.js
tine20/Tinebase/js/widgets/grid/FileUploadGrid.js