From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 2 Oct 2010 16:43:01 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~365
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3eab9af747bcb32d477fe242f6fd19d65fca323;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

c3eab9af747bcb32d477fe242f6fd19d65fca323
diff --cc automake.in
index 3897de481,6b36ae2fc..9cbe6c169
mode 100644,100755..100644
--- a/automake.in
+++ b/automake.in