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

Trivial merge