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

Trivial merge