Merge branch '2013.03' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 29 Jan 2014 15:40:07 +0000 (16:40 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 29 Jan 2014 15:40:07 +0000 (16:40 +0100)
commite11368ce03dd5c24294eff3a6ee9c3fd9f9e203a
tree1e3c8c9e0bb5793a6f9421442b842088825d5499
parentf928b8ad22ce9844a3e7d08bc3d7482536d6edd0
parent28a8b7b280261477ddd923809a6bc46c4681aee5
Merge branch '2013.03' into 2013.10

Conflicts:
tests/tine20/Crm/JsonTest.php
tine20/Crm/Model/Lead.php
tine20/Tinebase/Preference/Abstract.php
tests/tine20/Crm/JsonTest.php
tine20/Crm/Model/Lead.php
tine20/Tinebase/Preference/Abstract.php