Merge branch 'master' of https://opensourceprojects.eu/git/p/timbus/dpes/preservation-identifier/server
Authored by: Rudolf Mayer 2014-05-27
Parent(s): [4f0254][6242ee]
Child(ren): [f8f754]