Merge branch 'maint'
commite3d3f7d204c46c034ce71d8116ac21ef613fb263
authorJunio C Hamano <gitster@pobox.com>
Sun, 27 Feb 2011 08:52:15 +0000 (27 00:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Feb 2011 08:52:15 +0000 (27 00:52 -0800)
treed220a835037daff351682fdea430e0055aeb3b7d
parent046613c5465e4fc0611f93a5ef31d3815fb50c22
parent62270f6b0a4e67e5044fb0d70d0e82ac6e553eb2
Merge branch 'maint'

* maint:
  branch_merged: fix grammar in warning