Merge branch '2013.10' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 3 Nov 2014 12:42:57 +0000 (13:42 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 3 Nov 2014 12:42:57 +0000 (13:42 +0100)
commit54aa5cf55212cbd3ffc2577247bbdec2135af429
tree60722765d5305f6b531fa3ca8e8bf434144641fa
parent98aa6a8242ed9379c4b12e513792728875703c69
parent1be93c29b939fbbc308d04b48ef569a3c14f795a
Merge branch '2013.10' into 2014.09

Conflicts:
tests/tine20/HumanResources/JsonTests.php

Change-Id: Icdff961efda42d56457f32463f73a409f943e280
tests/tine20/HumanResources/JsonTests.php
tine20/HumanResources/Model/Employee.php
tine20/Tinebase/Convert/Json.php