Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 8 May 2015 19:08:24 +0000 (19:08 +0000)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 8 May 2015 19:08:24 +0000 (19:08 +0000)

Trivial merge