- enabling Lock for LibreOffice
Merge branch 'ob_sabredav2' into devel
Merge branch 'devel'