6bb8374 Merge branch 'master' into el6

Merged and Committed by Vincent Batts 9 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	golang-googlecode-net.spec
    
        
file modified
+5 -2