From: Dennis Schafroth <dennis@indexdata.com>
Date: Tue, 9 Aug 2011 10:37:21 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.5.7~13^2
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=ab30a2b6dfa4d154a7ebe02afd2ebf3d5b651ee8;p=pazpar2-moved-to-github.git

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
---

ab30a2b6dfa4d154a7ebe02afd2ebf3d5b651ee8