Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/pazpar2
authorHeikki Levanto <heikki@indexdata.dk>
Wed, 3 Sep 2014 10:59:00 +0000 (12:59 +0200)
committerHeikki Levanto <heikki@indexdata.dk>
Wed, 3 Sep 2014 10:59:00 +0000 (12:59 +0200)

Trivial merge