Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Jul 2013 08:16:27 +0000 (01:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Jul 2013 08:16:27 +0000 (01:16 -0700)
* maint:
fixup-builtins: retire an old transition helper script

1  2 
Makefile
diff --cc Makefile
Simple merge