geeqie.org Git - geeqie.git/commit

author	Klaus Ethgen <Klaus@Ethgen.de>
	Thu, 17 May 2012 17:28:56 +0000 (18:28 +0100)
committer	Klaus Ethgen <Klaus@Ethgen.de>
	Thu, 17 May 2012 17:28:56 +0000 (18:28 +0100)
commit	cb758c2979a2a096c45ab0cb691cd063d81ae703
tree	924489c75c591cc7367acaa398b5111ab33e8353	tree \| snapshot (tar.gz tar.bz2)
parent	af76525a87cc636cdf7f5454f4e32969ef903534	commit \| diff
parent	6f701885de29cc7ce188fdd3be50cdab253d5f98	commit \| diff

Merge commit 'refs/merge-requests/1' of git://gitorious.org/geeqie/geeqie into merge-requests/1

* git://gitorious.org/geeqie/geeqie:
Ignore duplicates with same path