5113b23 Merge remote-tracking branch 'origin/master'

Merged and Committed by jcollie 12 years ago
    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	asterisk.spec
    
        
file modified
+5 -2
file modified
+1 -1