Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Fri, 3 Sep 2010 11:45:52 +0000 (13:45 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Fri, 3 Sep 2010 11:45:52 +0000 (13:45 +0200)

Trivial merge