Merge branch 'paz-1008-a'
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 6 Jul 2015 08:52:38 +0000 (10:52 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 6 Jul 2015 08:52:38 +0000 (10:52 +0200)

Trivial merge