Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Mon, 7 Nov 2011 10:16:32 +0000 (11:16 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Mon, 7 Nov 2011 10:16:32 +0000 (11:16 +0100)

Trivial merge