Merge branch '2013.03' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 20 Dec 2013 13:12:11 +0000 (14:12 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 20 Dec 2013 13:12:11 +0000 (14:12 +0100)
commitbe7390d8f41cc79537b09adeadfa1270851d4d88
treeddc107c0d7f77195a9b75dbd1c24dd96feeee7c2
parent23c776aa32c952ba0a66158fc5b052707dadd8eb
parent5541cfdd478f9a71d9820dd54b9519330f308f3b
Merge branch '2013.03' into 2013.10
tests/tine20/Addressbook/ControllerTest.php
tine20/Addressbook/Controller/Contact.php
tine20/Tinebase/js/widgets/dialog/EditDialog.js