Merge branch 'yaz-756'
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 10 Apr 2014 13:47:13 +0000 (15:47 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 10 Apr 2014 13:47:13 +0000 (15:47 +0200)

Trivial merge