Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Thu, 11 Oct 2012 09:13:57 +0000 (11:13 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Thu, 11 Oct 2012 09:13:57 +0000 (11:13 +0200)

Trivial merge