Merge branch 'jk/shortlog-no-wrap-doc'
authorJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 02:35:01 +0000 (11 18:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 02:35:02 +0000 (11 18:35 -0800)
* jk/shortlog-no-wrap-doc:
  git-shortlog(1): document behaviour of zero-width wrap

1  2 
Documentation/git-shortlog.txt

Simple merge