Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Mon, 8 Oct 2012 18:27:15 +0000 (20:27 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Mon, 8 Oct 2012 18:27:15 +0000 (20:27 +0200)

Trivial merge