From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 24 Nov 2012 13:08:46 +0000 (+0100)
Subject: Merge branch 'origin/ng/master' into 'ng/master'.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c95017c8a2ebf9afcd63892d50ca51503a17c4a3;p=thirdparty%2Fautomake.git

Merge branch 'origin/ng/master' into 'ng/master'.

Hmph, I did a merge of 'master' into 'ng/master' without pulling first,
so I missed earlier changes to 'ng/master' that were in the central
repository but not in my local repository.  Since that merge required
some non-trivial conflicts resolutions, I don't want to redo it; I'm
thus merging the 'ng/master' from the central repository to the local
one "after the fact".
---

c95017c8a2ebf9afcd63892d50ca51503a17c4a3