Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/pazpar2
authorHeikki Levanto <heikki@indexdata.dk>
Wed, 18 Dec 2013 10:37:29 +0000 (11:37 +0100)
committerHeikki Levanto <heikki@indexdata.dk>
Wed, 18 Dec 2013 10:37:29 +0000 (11:37 +0100)

Trivial merge