Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Thu, 20 Sep 2012 10:56:30 +0000 (12:56 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Thu, 20 Sep 2012 10:56:30 +0000 (12:56 +0200)

Trivial merge