From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Nov 2009 22:44:43 +0000 (-0800)
Subject: Merge branch 'ap/maint-merge-strategy-list-fix'
X-Git-Tag: v1.6.6-rc1~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22c4e72d6eef8295a3311f6eb2f82a5494f8b88e;p=thirdparty%2Fgit.git

Merge branch 'ap/maint-merge-strategy-list-fix'
---

22c4e72d6eef8295a3311f6eb2f82a5494f8b88e