Merge branch 'maint'
commitf8abaebab3fe1a1b873f9636ea410ac4007c8fa8
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Jul 2013 08:16:27 +0000 (5 01:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Jul 2013 08:16:27 +0000 (5 01:16 -0700)
tree0501ad7e7fc1a0641d73dc7f554238b0f73484a9
parent04f2ddda8426d3ae46d52d9dcbfc00bd3c52e645
parent531c8dd4fb18e653d6170d367e4b23c3164d5ce0
Merge branch 'maint'

* maint:
  fixup-builtins: retire an old transition helper script
Makefile