c1f1802 Merge remote branch 'origin/el6/master'

Merged and Committed by jcollie 13 years ago
1 file changed. 39 lines added. 3 lines removed.
    Merge remote branch 'origin/el6/master'
    
    Conflicts:
    	0005-Change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
    	asterisk.spec
    
        
file modified
+39 -3