Merge branch 'master' into next
commit37119cf0f173bc11a1b5f662f322c8b304224b7c
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Dec 2010 22:45:35 +0000 (21 14:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Dec 2010 22:45:35 +0000 (21 14:45 -0800)
tree8846fccf9892990d1c0e2ee4c8fb8adb918c08ec
parent2fa91e0a0ee731b468a9ae901671487d9d0e1f9e
parent853563d7344ee532aa56f8a9aabcfdfb5c4fe2c3
Merge branch 'master' into next

* master:
  t0050: fix printf format strings for portability
  t3419-*.sh: Fix arithmetic expansion syntax error
  set_try_to_free_routine(NULL) means "do nothing special"