9a8f2a2 Merge branch 'master' into f20

Merged and Committed by till 9 years ago
    Merge branch 'master' into f20
    
    Conflicts:
    	.gitignore
    	dtv-scan-tables.spec
    	sources
    
        
file modified
+1 -0
file modified
+8 -2
file modified
+1 -1