358484f Merge branch 'master' into f13

Merged and Committed by tomspur 13 years ago
    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	sources
    	zeromq.spec
    
        
file modified
+1 -1
file modified
+26 -23