Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Fri, 11 Feb 2011 10:28:20 +0000 (11:28 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Fri, 11 Feb 2011 10:28:20 +0000 (11:28 +0100)

Trivial merge