Merge branch 'master' into yaz-744
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 26 Feb 2014 19:41:11 +0000 (20:41 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 26 Feb 2014 19:41:11 +0000 (20:41 +0100)

Trivial merge