85b3d5d Merge branch 'master' into f14

Merged and Committed by tomspur 13 years ago
    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	python-zmq.spec
    	sources
    
    update to 2.1.4
    
        
file modified
+2 -0
file added
+268
file modified
+25 -11
file modified
+1 -1