9f2eb8b Merge remote-tracking branch 'origin/master' into epel7

Merged and Committed by dchen 8 years ago
    Merge remote-tracking branch 'origin/master' into epel7
    
    Conflicts:
    	.gitignore
    	libinput.spec
    	sources
    
        
file modified
+3 -2
file modified
+17 -5
file modified
+1 -1