mspacek / rpms / asterisk

Forked from rpms/asterisk 2 years ago
Clone

52e1219 Merge branch 'master' into f18

Merged and Committed by jcollie 11 years ago
    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	asterisk.spec
    	sources
    
        
file modified
+6 -0
file modified
+307 -13
file modified
+2 -2
file modified
+2 -2