Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorMike Taylor <mike@indexdata.com>
Mon, 11 Aug 2014 16:53:11 +0000 (17:53 +0100)
committerMike Taylor <mike@indexdata.com>
Mon, 11 Aug 2014 16:53:11 +0000 (17:53 +0100)

Trivial merge