Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/nmh
authorLyndon Nerenberg <lyndon@orthanc.ca>
Sat, 20 Oct 2012 22:02:16 +0000 (15:02 -0700)
committerLyndon Nerenberg <lyndon@orthanc.ca>
Sat, 20 Oct 2012 22:02:16 +0000 (15:02 -0700)

Trivial merge