Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 30 Aug 2013 09:22:29 +0000 (11:22 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 30 Aug 2013 09:22:29 +0000 (11:22 +0200)
1  2 
tine20/Felamimail/Backend/Imap.php
tine20/Tinebase/js/widgets/relation/GenericPickerGridPanel.js

Simple merge