refs#28 intermediate commit for locks
Merge branch 'dev/ref#28' of https://github.com/OpenDTP/ScribusServer into dev/ref#28
Merge pull request #1 from OpenDTP/dev/ref#28

Dev/ref#28
Merge pull request #2 from OpenDTP/master

merge
Merge branch 'preprod' of github.com:OpenDTP/ScribusServer into dev/ref#58
Merge pull request #3 from OpenDTP/dev/ref#58

Dev/ref#58
Merge branch 'preprod' of github.com:OpenDTP/ScribusServer into dev/ref#19