Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/pazpar2
authorHeikki Levanto <heikki@indexdata.dk>
Mon, 8 Sep 2014 12:05:05 +0000 (14:05 +0200)
committerHeikki Levanto <heikki@indexdata.dk>
Mon, 8 Sep 2014 12:05:05 +0000 (14:05 +0200)

Trivial merge