From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 28 Dec 2012 18:14:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/ng/master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=191e6b139c8eabc4639294c8c885a169e56f8a59;p=thirdparty%2Fautomake.git

Merge remote-tracking branch 'origin/ng/master' into ng/master

Fix-up a local branch mess-up.  Luckily not serious at all.
Still, sorry for the noise.

* origin/ng/master:
  [Nothing really to be merged]
---

191e6b139c8eabc4639294c8c885a169e56f8a59