5f4dd0e Merge branch 'master' of ssh://pkgs.fedoraproject.org/libpri

Merged and Committed by jcollie 13 years ago
1 file changed. 3 lines added. 0 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/libpri
    
    Conflicts:
    	libpri.spec
    
        
file modified
+3 -0