From: Junio C Hamano <junkio@cox.net>
Date: Wed, 14 Dec 2005 21:04:43 +0000 (-0800)
Subject: Merge branch 'hold/am'
X-Git-Tag: v0.99.9n^2~5
X-Git-Url: https://git.octo.it/?p=git.git;a=commitdiff_plain;h=9a26dbd120110ad4e07d3047abc13d615183c8ec

Merge branch 'hold/am'
---

9a26dbd120110ad4e07d3047abc13d615183c8ec