Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 27 Feb 2011 08:52:15 +0000 (00:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Feb 2011 08:52:15 +0000 (00:52 -0800)
* maint:
  branch_merged: fix grammar in warning


Trivial merge