Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 20 Aug 2013 13:45:29 +0000 (15:45 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 20 Aug 2013 13:45:29 +0000 (15:45 +0200)
commit1683bb99c34012c69de5510fb1b3b5cfbcdaa3ea
treee0ad630bb3c4e552c1f14293c025a0b22d445768
parent15820c04775355ec9925f60caf1a3481f72c2198
parent0222982e0ead5922f366fed1b3a58ba125934e41
Merge branch '2013.03'

Conflicts:
tine20/Tinebase/js/widgets/dialog/EditDialog.js
tine20/Tinebase/js/widgets/dialog/EditDialog.js