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)
Conflicts:
tine20/Tinebase/Model/Filter/CustomField.php

1  2 
tine20/Addressbook/Convert/Contact/VCard/Sogo.php
tine20/Tinebase/Model/Filter/CustomField.php