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

Trivial merge