Merge branch 'fixup-lock-options'
authorNikolaus Rath <Nikolaus@rath.org>
Sat, 15 Oct 2016 23:24:02 +0000 (16:24 -0700)
committerNikolaus Rath <Nikolaus@rath.org>
Sat, 15 Oct 2016 23:24:02 +0000 (16:24 -0700)
1  2 
lib/fuse_lowlevel.c

Simple merge