9a1660f Merge branch 'f19' into f20

Merged and Committed by Dominik Mierzejewski 10 years ago
    Merge branch 'f19' into f20
    
    Conflicts:
    	libdvdnav.spec
    
        
file modified
+7 -1