Merge branch 'paz-834' of ssh://git.indexdata.com/home/git/pub/pazpar2 into paz-834
authorDennis Schafroth <dennis@indexdata.com>
Wed, 10 Oct 2012 12:57:26 +0000 (14:57 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Wed, 10 Oct 2012 12:57:26 +0000 (14:57 +0200)

Trivial merge