Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 12 Sep 2010 20:53:03 +0000 (13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 12 Sep 2010 20:53:03 +0000 (13:53 -0700)
commit5879b6bbcaba7696e4abfa717748da166f915405
tree83c87b6b5c7ac72db60a027b3248e740f2f07f91
parent5418d96ddca8134b5abeb99430f61c062d91f722
parente22148f406a7a31a25ebda01d21d9a4646ce82ea
Merge branch 'maint'

* maint:
  t3101: modernise style
  compat/nedmalloc: don't force NDEBUG on the rest of git

Conflicts:
Makefile
Makefile