0f850bb Merge branch 'master' into el6

Merged and Committed by niveusluna 12 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	weechat.spec
    
        
file modified
+7 -0
file modified
+4 -0
file added
+700
file modified
+7 -2