Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 11 Feb 2015 10:55:44 +0000 (11:55 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 11 Feb 2015 10:55:44 +0000 (11:55 +0100)
commit92dc71b99b1a0989a02c7fab2c307725e7fface5
tree8ed89d0b456d84311e279b17cd78e43c21b1326d
parentc73e7ea9ca76652a1b7ee3e1d3b2148409677f80
parentabac0704c411e448aa5bc58e970f6f3a0fbb0bff
Merge branch '2013.10' into 2014.11

Conflicts:
tine20/Calendar/translations/de.po

Change-Id: Ica114bb265602c623d275a3fc1c84cc4a391341d
tine20/Calendar/translations/de.po