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)
commit2a2500cef5aaea77789a0f7bfc5d9b12c7a1b61f
tree8750e99936c4eee6fd21da03ccd3d7324b325e8d
parent4933232e195fa4650400990bfba4c88fae9b8a29
parent4ced60d7fc474f008d642e280f7205f75f7c04d9
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