Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 1 Jul 2013 14:13:43 +0000 (16:13 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 1 Jul 2013 14:13:43 +0000 (16:13 +0200)
commit1683ab238d2919dc27f13926b2171061b6465710
tree37e78c5b4d8225e71a3e8c6b9573056aa82b52d4
parentac6226bb0af0b8b4d69117e22bfeb26fbe3997b4
parentf6c279e4318f26ef27585b3cb375f3b2b51b3cf2
Merge branch '2013.03'

Conflicts:
tine20/Tinebase/Model/Filter/CustomField.php
tine20/Addressbook/Convert/Contact/VCard/Sogo.php
tine20/Tinebase/Model/Filter/CustomField.php