Merge branch 'master' into nextnext
commit19a36d7840502f1703b3162f46f1282998789573
authorJunio C Hamano <gitster@pobox.com>
Sun, 27 Feb 2011 08:52:18 +0000 (27 00:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Feb 2011 08:52:18 +0000 (27 00:52 -0800)
treeee1e88cd8e1f2879abe340e6d14b1272148bea8a
parent169333165154cc5974b9b64e7b5d0e1384274b9b
parente3d3f7d204c46c034ce71d8116ac21ef613fb263
Merge branch 'master' into next

* master:
  branch_merged: fix grammar in warning