Merge branch 'master' of http://www.geeqie.org/git/geeqie