Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/nmh
authorLyndon Nerenberg <lyndon@orthanc.ca>
Tue, 16 Oct 2012 23:40:17 +0000 (16:40 -0700)
committerLyndon Nerenberg <lyndon@orthanc.ca>
Tue, 16 Oct 2012 23:40:17 +0000 (16:40 -0700)

Trivial merge