From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 14 Feb 2012 13:07:12 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v1.11b~160
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2a2500cef5aaea77789a0f7bfc5d9b12c7a1b61f;p=platform%2Fupstream%2Fautomake.git

Merge branch 'maint'

* maint:
  fixup: do not tickle makefile-deps.test with the make_dryrun code
  gitattributes: custom merge driver for ChangeLog not needed anymore
  gitattributes: use "union" merge driver for NEWS
---

2a2500cef5aaea77789a0f7bfc5d9b12c7a1b61f