Merge branch 'master' of git.sv.nongnu.org:/srv/git/nmh
authorKen Hornstein <kenh@pobox.com>
Thu, 29 Nov 2012 20:28:12 +0000 (15:28 -0500)
committerKen Hornstein <kenh@pobox.com>
Thu, 29 Nov 2012 20:28:12 +0000 (15:28 -0500)

Trivial merge