fc77a26 Merge remote-tracking branch 'origin/f21' into epel7

Merged and Committed by mcepl 9 years ago
    Merge remote-tracking branch 'origin/f21' into epel7
    
    Conflicts:
    	.gitignore
    	OpenLP.spec
    	sources
    
        
file modified
+2 -0
file modified
+12 -1
file modified
+1 -1