49b2f40 Merge branch 'master' of ssh://pkgs.fedoraproject.org/libbluray

Merged and Committed by xavierb 13 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/libbluray
    
    Conflicts:
    	libbluray.spec
    
        
file modified
+5 -2