ceaa78f Merge remote branch 'origin/master' into f26

Merged and Committed by robert 6 years ago
    Merge remote branch 'origin/master' into f26
    
    Conflicts:
    	.gitignore
    	libmtp.spec
    	sources
    
        
file modified
+1 -0
file modified
+4 -1
file modified
+1 -1