From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 17 Dec 2014 16:53:32 +0000 (+0100)
Subject: Merge branches 'pr19311' and 'micro' into minor
X-Git-Tag: v1.15~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5825771062a8823cd08e8547655f4c5cdf9b94bb;p=thirdparty%2Fautomake.git

Merge branches 'pr19311' and 'micro' into minor

* pr19311:
  Expose automake bug#19311
  build: fix race in parallel builds

* micro:
  Automake docs: fix typos and use of British English
  build: fix race in parallel builds
---

5825771062a8823cd08e8547655f4c5cdf9b94bb