Merge branch '2013.03' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jan 2014 20:57:01 +0000 (21:57 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jan 2014 20:57:01 +0000 (21:57 +0100)
commitff5245c61185d51d7a186fe99ce2026a29748718
tree4d2a4d7873c1c9e49d2910a353ae231abba23f3b
parentaa6ff7b0a69c7848531d17e4890e850e8f5d8d64
parentc4b5d29e352f83509586c4410bba98cf93c387e8
Merge branch '2013.03' into 2013.10

Conflicts:
tine20/Addressbook/js/ContactEditDialog.js
tine20/Addressbook/js/ContactEditDialog.js