From: David Levine <levinedl@acm.org>
Date: Wed, 29 Feb 2012 22:36:59 +0000 (-0600)
Subject: Merge branch 'master' of git.sv.nongnu.org:/srv/git/nmh
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=ec4adac00f7bfe2caed96fdb645435d578f6d3ca;p=mmh

Merge branch 'master' of git.sv.nongnu.org:/srv/git/nmh

Conflicts:
	docs/historical/README
---

ec4adac00f7bfe2caed96fdb645435d578f6d3ca