Merge branch 'maint'
commit6339f67fedfec454294dc33ebc3dcec6eeb70e02
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Jun 2010 04:02:16 +0000 (13 21:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Jun 2010 04:02:16 +0000 (13 21:02 -0700)
tree7b90636284aa8ca77e917c456234e3859d173f37
parenta5080d8e10915daa57b5b42c887483d202b45c55
parente0a9110176e3b17414b1b38fae8febd0791eaa0c
Merge branch 'maint'

* maint:
  git-mailinfo documentation: clarify -u/--encoding