Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Thu, 23 Aug 2012 13:22:27 +0000 (15:22 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Thu, 23 Aug 2012 13:22:27 +0000 (15:22 +0200)

Trivial merge