Merge branch 'mp-532'
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 2 Apr 2014 09:48:51 +0000 (09:48 +0000)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 2 Apr 2014 09:48:51 +0000 (09:48 +0000)

Trivial merge