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

author	Dennis Schafroth <dennis@indexdata.com>
	Thu, 17 Jun 2010 15:19:34 +0000 (17:19 +0200)
committer	Dennis Schafroth <dennis@indexdata.com>
	Thu, 17 Jun 2010 15:19:34 +0000 (17:19 +0200)
commit	9a29dfe185cbcbec55a5ca0a3c491b03ff45222f
tree	7b1a67c5e9001a29ec9f52b303eb0dd1c82f444c	tree \| snapshot
parent	84a59bac11f3eece56bb0f4cf107dcd462798cea	commit \| diff
parent	0b98fc3f38dc8d6d789f0e0746d79e342ea05687	commit \| diff

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

Conflicts:
test/test_http_49.res

Restore to new test result.