e9f3c15 Merge branch 'master' into el6

Merged and Committed by dchen 9 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	python-polib.spec
    	sources
    
        
file modified
+1 -0
file modified
+71 -7
file modified
+1 -1