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

author	Dennis Schafroth <dennis@indexdata.com>
	Tue, 9 Aug 2011 10:37:21 +0000 (12:37 +0200)
committer	Dennis Schafroth <dennis@indexdata.com>
	Tue, 9 Aug 2011 10:37:21 +0000 (12:37 +0200)
commit	ab30a2b6dfa4d154a7ebe02afd2ebf3d5b651ee8
tree	ca215ca0226032dffa1fe525c6f5ceb8c033a6bc	tree \| snapshot
parent	2a805ec4c390609a26bc584bc9979d94a1096934	commit \| diff
parent	c4d61f7da9aa32ec5cba3971f3826e20cb46ee29	commit \| diff

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

Conflicts:
etc/tmarc.xsl

Fix or between d901 and d907 for iii-id