Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 5 Mar 2015 13:57:36 +0000 (14:57 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 5 Mar 2015 13:57:36 +0000 (14:57 +0100)

Trivial merge