Merge branch 'protocol-version2' of ssh://git.indexdata.com/home/git/pub/pazpar2...
authorDennis Schafroth <dennis@indexdata.com>
Tue, 17 Apr 2012 15:40:07 +0000 (17:40 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Tue, 17 Apr 2012 15:40:07 +0000 (17:40 +0200)

Trivial merge