Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Thu, 24 Nov 2011 09:30:42 +0000 (10:30 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Thu, 24 Nov 2011 09:30:42 +0000 (10:30 +0100)

Trivial merge