Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Tue, 2 Apr 2013 13:52:56 +0000 (15:52 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Tue, 2 Apr 2013 13:52:56 +0000 (15:52 +0200)

Trivial merge