Merge branch 'tine20.com/2012.10' into 2013.03
authorCornelius Weiß <mail@corneliusweiss.de>
Thu, 28 Mar 2013 14:11:18 +0000 (15:11 +0100)
committerCornelius Weiß <mail@corneliusweiss.de>
Thu, 28 Mar 2013 14:11:18 +0000 (15:11 +0100)
commitb6f161c0580d9bc58372231401e4495769889ffe
tree477314e845a743e023a5b30b19adb09b02f7339a
parentd4bf9e0fe3c6405496dcaa80d88551719d2271b3
parentddbf5d2c60d8cbd03dbc8a1d571423286d933ace
Merge branch 'tine20.com/2012.10' into 2013.03
tine20/Addressbook/js/ContactEditDialog.js
tine20/Felamimail/js/MessageEditDialog.js