From: David Levine <levinedl@acm.org>
Date: Sat, 17 Mar 2012 03:11:09 +0000 (-0500)
Subject: Merge branch 'master' of git.sv.nongnu.org:/srv/git/nmh
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=ef85387bf79a9922c51ad4a279bd3acad4c3c9ab;hp=7cc0e9952d85f30d1d8ce85cc7a9eb0a5e52e202;p=mmh

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

Conflicts:
	Makefile.am
---