git.indexdata.com Git - pazpar2-moved-to-github.git/commit

author	Jason Skomorowski <jason@indexdata.com>
	Fri, 18 Sep 2009 14:41:34 +0000 (10:41 -0400)
committer	Jason Skomorowski <jason@indexdata.com>
	Fri, 18 Sep 2009 14:41:34 +0000 (10:41 -0400)
commit	6daff87a18a4b0affde2b418d61940cdec57c93e
tree	c131759150f891961f99292d36f6b8e701ecff51	tree \| snapshot
parent	2c07c3edbd2fb4c6f72b6527632fab264b6ab66b	commit \| diff
parent	3f4182db68544cec9898991d7cf62de98e27b5fe	commit \| diff

Merge branch 'master' of git://git.indexdata.com/pazpar2

Conflicts:
src/logic.c

Metasearcher