1262c3 Merge branch 'master' into f20

Merged and Committed by Paul Wouters 10 years ago
    Merge branch 'master' into f20
    
    Conflicts:
    	.gitignore
    	socat.spec
    	sources
    
        
file modified
+1 -0
file modified
+14 -17
file modified
+1 -1