Author :
Stefano Lattarini
Date :
2012-02-14 14:07:12
Hash :2a2500ce Message :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