Merge branch '2013.10' into pu/2013.10-longrun
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 Jan 2014 15:21:20 +0000 (16:21 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 Jan 2014 15:21:20 +0000 (16:21 +0100)
commitac07ab223fe70f2e628dd71ddd0fa7133641425c
tree4033b3409c11798cf02053601dfa99e193652df3
parentcf9d992752b25dc2c3340b30ffb522ec6440f7f2
parentd0f0ead2b646d645c4bc3969b02ed9a6371d72cf
Merge branch '2013.10' into pu/2013.10-longrun
tests/tine20/HumanResources/ControllerTests.php
tine20/HumanResources/Model/Account.php
tine20/HumanResources/js/AccountEditDialog.js
tine20/HumanResources/translations/de.po
tine20/HumanResources/translations/template.pot
tine20/Sales/translations/de.po
tine20/Sales/translations/template.pot