Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Mon, 19 Dec 2011 11:06:12 +0000 (12:06 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Mon, 19 Dec 2011 11:06:12 +0000 (12:06 +0100)

Trivial merge