Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Mon, 17 Jan 2011 15:31:57 +0000 (16:31 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Mon, 17 Jan 2011 15:31:57 +0000 (16:31 +0100)

Trivial merge