Merge branch 'tr/maint-mailinfo'

* tr/maint-mailinfo: mailinfo: with -b, keep space after [foo] am: learn passing -b to mailinfo Conflicts: git-am.sh

Junio C Hamano committed Jan 29, 2012 at 13:18 UTC bff64a9cdabee8476ad1d2e45f586a2d6a884363

No changes.