Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Fri, 2 Sep 2011 13:26:26 +0000 (15:26 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Fri, 2 Sep 2011 13:26:26 +0000 (15:26 +0200)

Trivial merge