9605fba Merge branch 'master' into el6

Merged and Committed by dchen 11 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	ibus-table-chinese.spec
    	sources
    
        
file modified
+1 -0
file modified
+22 -11
file modified
+1 -1