Merge branch 'master' of git.sv.nongnu.org:/srv/git/nmh
authorDavid Levine <levinedl@acm.org>
Wed, 29 Feb 2012 22:36:59 +0000 (16:36 -0600)
committerDavid Levine <levinedl@acm.org>
Wed, 29 Feb 2012 22:36:59 +0000 (16:36 -0600)
commitec4adac00f7bfe2caed96fdb645435d578f6d3ca
tree1f377f154d4ba91b9825a282bc01b9b7ee118f13
parentc7f326f4ff250eaf98a101b4406976c7a11c0063
parent7565efea3b91264fb6055b2ecb8980807c2da677
Merge branch 'master' of git.sv.nongnu.org:/srv/git/nmh

Conflicts:
docs/historical/README