Merge branch 'master' of git.sv.nongnu.org:/srv/git/nmh
authorDavid Levine <levinedl@acm.org>
Sat, 28 Jan 2012 20:12:05 +0000 (14:12 -0600)
committerDavid Levine <levinedl@acm.org>
Sat, 28 Jan 2012 20:12:05 +0000 (14:12 -0600)

Trivial merge