Merge branch 'master' of git://git.indexdata.com/m4
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 7 Aug 2012 11:35:09 +0000 (13:35 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 7 Aug 2012 11:35:09 +0000 (13:35 +0200)

Trivial merge