Merge branch 'master' into yaz-744
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 27 Feb 2014 10:20:49 +0000 (11:20 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 27 Feb 2014 10:20:49 +0000 (11:20 +0100)

Trivial merge