Merge branch 'maint'
commit7505ae272bad53c6451f34ff5f04ad24f29b6dd9
authorJunio C Hamano <gitster@pobox.com>
Tue, 7 Sep 2010 00:40:18 +0000 (6 17:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 7 Sep 2010 00:40:18 +0000 (6 17:40 -0700)
tree0dab4d35ffe6f97b955a23c07fa6d8ce5edc2dec
parent79d532c36a5d275ed237e196f36054f3c45d70aa
parent04df568be53c42d07aea393effc7c5653f245d9a
Merge branch 'maint'

* maint:
  revert: Fix trivial comment style issue
  cache_tree_free: Fix small memory leak

Conflicts:
builtin/revert.c