26c496b Merge remote branch 'origin/el6/master'

Merged and Committed by stingray 13 years ago
1 file changed. 3 lines added. 0 lines removed.
    Merge remote branch 'origin/el6/master'
    
    Conflicts:
    	weechat.spec
    
        
file modified
+3 -0