Merge branch 'pu/2013.10-clipboard' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 9 Feb 2015 15:41:11 +0000 (16:41 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 9 Feb 2015 15:41:11 +0000 (16:41 +0100)
commitabac0704c411e448aa5bc58e970f6f3a0fbb0bff
treee4a986d93331c3b6c969a0c8b839e30988f511fa
parent3f938c1eb3aff7b93dca39e65a04c26f74735dda
parentd5d2e91e430bc1a51f940ac8b254fd69021452a6
Merge branch 'pu/2013.10-clipboard' into 2013.10

Conflicts:
tine20/Calendar/translations/de.po

Change-Id: Iab280980cf051874a9363de1ca67b72c49bf5f18
tine20/Calendar/js/EventUI.js
tine20/Calendar/js/MainScreenCenterPanel.js
tine20/Calendar/translations/de.po
tine20/Calendar/translations/template.pot
tine20/Tinebase/Tinebase.jsb2