fixing bad merge
Merge branch 'master' of https://github.com/rdassen/gstfs-ng