Merge branch 'tr/mergetool-valgrind' into maint

* tr/mergetool-valgrind: Symlink mergetools scriptlets into valgrind wrappers

Junio C Hamano committed Oct 15, 2011 at 20:46 UTC 8f858299b585e4be0648432a78a94b0260b3ad86

No changes.