Merge branch 'master' of https://github.com/SLUB-digitalpreservation/fixit_tiff

git-svn-id: https://sdvsvn10.slub-dresden.de/svn/Langzeitarchivierung/trunk/fixit/fixit_tiff@1253 c63e1d0e-0205-4395-96c5-23d0ee883611
Merge branch 'master' of https://github.com/SLUB-digitalpreservation/fixit_tiff