Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 9 Sep 2013 14:33:27 +0000 (16:33 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 9 Sep 2013 14:33:27 +0000 (16:33 +0200)
commit5781542f7541ec3ae9f40bffba799211a2c9a294
tree3d47181e64393886b6a6fe82c0149fd1ad6a4862
parent3ae09c881851fb44b833d42b2dc912783a44b1a3
parent5713ea5af521e2cc1cbc6082de57b9f7bb04f9e9
Merge branch '2013.03'

Conflicts:
tine20/Tinebase/js/widgets/grid/GridPanel.js
tine20/Tinebase/translations/template.pot
tine20/Tinebase/js/widgets/grid/GridPanel.js
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot