From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 16 Jan 2013 12:20:12 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v1.16~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d9ee5edf6f4a6100b8faa2a3e0c7dc32ba91ea9;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  subdir-objects: complain if it isn't enabled
  plans: update w.r.t. latest changes
---

3d9ee5edf6f4a6100b8faa2a3e0c7dc32ba91ea9