Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 20 Aug 2013 08:29:47 +0000 (10:29 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 20 Aug 2013 08:29:47 +0000 (10:29 +0200)
commit15820c04775355ec9925f60caf1a3481f72c2198
tree0038f79d30fd36dc1f4972b4ad9d21c894ffba49
parent7b1622dc5d498db8a36076376250ba9070b72628
parentb0dd694f88aebc3df08b970b816e01eee125406a
Merge branch '2013.03'

Conflicts:
tine20/Felamimail/Backend/Cache/Sql/Message.php
tine20/Tinebase/js/widgets/dialog/EditDialog.js
tine20/Tinebase/js/widgets/relation/GenericPickerGridPanel.js
tine20/library/OpenDocument/Document.php
tine20/Admin/js/user/EditDialog.js
tine20/Felamimail/Backend/Cache/Sql/Message.php
tine20/Tinebase/Core.php
tine20/Tinebase/js/ux/WindowFactory.js
tine20/Tinebase/js/widgets/dialog/EditDialog.js
tine20/Tinebase/js/widgets/relation/GenericPickerGridPanel.js
tine20/library/OpenDocument/Document.php