b5debab Merge branch 'master' of ssh://pkgs.fedoraproject.org/rawtherapee

Merged and Committed by tnorth 13 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/rawtherapee
    
    Conflicts:
    	rawtherapee.spec
    
        
file modified
+7 -0