efd40a3 Merge branch 'master' into f21

Merged and Committed by dchen 9 years ago
    Merge branch 'master' into f21
    
    Conflicts:
    	ibus-chewing.spec
    
        
file modified
+1 -0
file modified
+13 -8
file modified
+1 -1