Merge branch 'master' of git.sv.nongnu.org:/srv/git/nmh
authorDavid Levine <levinedl@acm.org>
Fri, 13 Jan 2012 04:17:54 +0000 (22:17 -0600)
committerDavid Levine <levinedl@acm.org>
Fri, 13 Jan 2012 04:17:54 +0000 (22:17 -0600)

Trivial merge