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

author	Dennis Schafroth <dennis@indexdata.com>
	Thu, 12 Apr 2012 16:14:14 +0000 (18:14 +0200)
committer	Dennis Schafroth <dennis@indexdata.com>
	Thu, 12 Apr 2012 16:14:14 +0000 (18:14 +0200)
commit	c4bb40d07ac3ec2dcfa466ebe0a62385db2ddf83
tree	a1cc1dd3343eaa21491a93945bc11eac74605a54	tree \| snapshot
parent	52a4a04a986729107d87794c22a2ae41904eaf45	commit \| diff
parent	5c1b5b3aee37bbac758f7bc2ccf370cfcc6b9723	commit \| diff

Merge branch 'protocol-version2' of ssh://git.indexdata.com/home/git/pub/pazpar2 into protocol-version2

Conflicts:
src/session.c

Fixed.

Metasearcher