Merge branch '2012.10'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 9 Jan 2013 10:00:03 +0000 (11:00 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 9 Jan 2013 10:00:03 +0000 (11:00 +0100)
commitd2ef73060e44f3a62dd6ddd70f36a42a2b710ca5
tree7bf44d4d5bc8f1ad6492e3a150522936dd11914e
parent1d0b5b8338365587a1a2faf856118c2d1e5f8b24
parent27a3f42e42c64a433563bad08408231793d3d356
Merge branch '2012.10'

Conflicts:
tine20/Filemanager/Setup/Update/Release6.php
tine20/Filemanager/Setup/setup.xml
tine20/Filemanager/Setup/Update/Release7.php
tine20/Filemanager/Setup/setup.xml