Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/pazpar2
authorHeikki Levanto <heikki@indexdata.dk>
Tue, 17 Dec 2013 15:06:32 +0000 (16:06 +0100)
committerHeikki Levanto <heikki@indexdata.dk>
Tue, 17 Dec 2013 15:06:32 +0000 (16:06 +0100)

Trivial merge