From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 25 Apr 2010 16:49:18 +0000 (+0200)
Subject: Merge branch 'maint' into foo
X-Git-Tag: ng-0.5a~426
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4c5a0072e2825d77f4dc228a2348051518a6692;p=thirdparty%2Fautomake.git

Merge branch 'maint' into foo
---

d4c5a0072e2825d77f4dc228a2348051518a6692
diff --cc automake.in
index 4a753db1e,b3a2cae05..e8a972704
mode 100644,100755..100644
--- a/automake.in
+++ b/automake.in