Merge branch 'master' of git.sv.nongnu.org:/srv/git/nmh
authorDavid Levine <levinedl@acm.org>
Sat, 17 Mar 2012 03:11:09 +0000 (22:11 -0500)
committerDavid Levine <levinedl@acm.org>
Sat, 17 Mar 2012 03:11:09 +0000 (22:11 -0500)
Conflicts:
Makefile.am


Trivial merge