db87ba3 Merge branch 'master' of ssh://pkgs.fedoraproject.org/asterisk

Merged and Committed by jcollie 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/asterisk
    
    Conflicts:
    	asterisk.spec
    
        
file modified
+3 -0