Merge branch 'master' into next
commit4a51ab1b2fe2733af7ac3b8722bf180e8e7b0029
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Jun 2010 04:02:39 +0000 (13 21:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Jun 2010 04:02:39 +0000 (13 21:02 -0700)
tree88ea0349e0a0507cf2a9a415c5afc8ea40a08128
parentd01c620bb75e152ddaea68b3d6ffe632e67896c5
parent6339f67fedfec454294dc33ebc3dcec6eeb70e02
Merge branch 'master' into next

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