From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 7 Sep 2010 00:40:18 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.3-rc1~18
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=7505ae272bad53c6451f34ff5f04ad24f29b6dd9;p=git.git

Merge branch 'maint'

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

Conflicts:
	builtin/revert.c
---

7505ae272bad53c6451f34ff5f04ad24f29b6dd9