Merge branch 'fix-file-locking'.
authorDaniel Carl <danielcarl@gmx.de>
Sun, 1 Nov 2015 21:50:12 +0000 (22:50 +0100)
committerDaniel Carl <danielcarl@gmx.de>
Sun, 1 Nov 2015 21:50:12 +0000 (22:50 +0100)
commit4f4de9cd12922f6864cd5b49b4e424abca9007ea
tree45d44b136433bcf51008167c0eaf82def0d10c55
parentbbc9182c1c282a141ba9c24276597b61a309a860
parentd546d7d1e39db8bac27cac250c3a40f854c1a9ef
Merge branch 'fix-file-locking'.