From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Nov 2009 22:35:07 +0000 (-0800)
Subject: Merge branch 'jc/maint-am-keep'
X-Git-Tag: v1.6.6-rc1~18
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5e2f779cbf60997809130fde213736e1ea4f6f33;p=git.git

Merge branch 'jc/maint-am-keep'
---

5e2f779cbf60997809130fde213736e1ea4f6f33