Merge branch 'master' into yaz-744
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 26 Feb 2014 14:30:31 +0000 (15:30 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 26 Feb 2014 14:30:31 +0000 (15:30 +0100)

Trivial merge