Merge branch 'master' of git.sv.nongnu.org:/srv/git/nmh
authorDavid Levine <levinedl@acm.org>
Fri, 3 Feb 2012 23:10:49 +0000 (17:10 -0600)
committerDavid Levine <levinedl@acm.org>
Fri, 3 Feb 2012 23:10:49 +0000 (17:10 -0600)

Trivial merge