Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 14 Feb 2012 13:07:12 +0000 (14:07 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 14 Feb 2012 13:07:12 +0000 (14:07 +0100)
* 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


Trivial merge