545a7d7 Merge branch 'master' into el5

Merged and Committed by till 9 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	bindfs.spec
    	sources
    
        
file modified
+5 -1
file modified
+46 -6
file modified
+1 -1