Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Wed, 30 May 2012 17:47:54 +0000 (19:47 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Wed, 30 May 2012 17:47:54 +0000 (19:47 +0200)

Trivial merge