2a9b735 Merge branch 'master' of ssh://pkgs.fedoraproject.org/geeqie

Merged and Committed by mschwendt 9 years ago
1 file changed. 5 lines added. 2 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/geeqie
    
    Conflicts:
    	geeqie.spec
    
        
file modified
+5 -2