Merge branch 'maint'

* maint:
Unquote From line from patch before comparing with given from address.
git-cherry: Document 'limit' command-line option

diff --cc Documentation/git-cherry.txt
Simple merge

diff --cc GIT-VERSION-GEN
Simple merge