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)
Conflicts:
tine20/Tinebase/js/widgets/dialog/EditDialog.js

1  2 
tine20/Tinebase/js/widgets/dialog/EditDialog.js