Merge branch '2013.10'
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 25 Nov 2013 11:11:54 +0000 (12:11 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 25 Nov 2013 11:11:54 +0000 (12:11 +0100)
commit7369729ddd701f4078a7e0d3b82ddef9a1a77ef1
treeb7ef6ea7355e1ff3f32002313f1edc93633fe25a
parenteb7adfe4574e05b2f63cd3992117652675d910b9
parent53cf3fffce2d36668e6c5a44fbca9bc529e57b1a
Merge branch '2013.10'

Conflicts:
tine20/build.xml
tine20/build.xml