Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Mon, 14 May 2012 10:34:49 +0000 (12:34 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Mon, 14 May 2012 10:34:49 +0000 (12:34 +0200)

Trivial merge