Merge branch 'tine20.com/2012.10' into 2013.03
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 1 Jul 2013 14:10:58 +0000 (16:10 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 1 Jul 2013 14:10:58 +0000 (16:10 +0200)
Conflicts:
tests/tine20/Felamimail/JsonTest.php

1  2 
tests/tine20/Tinebase/CustomFieldTest.php
tine20/Tinebase/Model/Filter/CustomField.php