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)
commitf6c279e4318f26ef27585b3cb375f3b2b51b3cf2
treebf3d448b43f453664ebcd3e3c0e49636ac2cb844
parent4c97bc7b62e4648b95fa0b554e3a1a5bce699590
parent2fe85a388ea5e12115f8493ed97a5be097faf3cc
Merge branch 'tine20.com/2012.10' into 2013.03

Conflicts:
tests/tine20/Felamimail/JsonTest.php
tests/tine20/Tinebase/CustomFieldTest.php
tine20/Tinebase/Model/Filter/CustomField.php