Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Tue, 8 Nov 2011 14:05:01 +0000 (15:05 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Tue, 8 Nov 2011 14:05:01 +0000 (15:05 +0100)

Trivial merge