71f0e5b Merge branch 'master' of ssh://pkgs.fedoraproject.org/rdma

Merged and Committed by dledford 11 years ago
1 file changed. 5 lines added. 14 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/rdma
    
    Conflicts:
    	rdma.spec
    
        
file modified
+5 -14