Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Fri, 16 Dec 2011 12:50:54 +0000 (13:50 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Fri, 16 Dec 2011 12:50:54 +0000 (13:50 +0100)

Trivial merge