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)
commitef85387bf79a9922c51ad4a279bd3acad4c3c9ab
tree5656652089eb67a4afd7c0917409cb2757215f20
parent7cc0e9952d85f30d1d8ce85cc7a9eb0a5e52e202
parent67c56bad23525bd3d5f4d155b4f602a4183c6170
Merge branch 'master' of git.sv.nongnu.org:/srv/git/nmh

Conflicts:
Makefile.am