20b3048 Merge branch 'master' into f13

Merged and Committed by John W. Linville 10 years ago
    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    
        
file modified
+1 -1
file modified
+16 -4
file modified
+15 -0
file modified
+1 -1