Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Fri, 27 Aug 2010 12:04:57 +0000 (14:04 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Fri, 27 Aug 2010 12:04:57 +0000 (14:04 +0200)

Trivial merge