Merge branch 'xf/user-manual-ff' into maint

* xf/user-manual-ff: user-manual: fix the description of fast-forward

Junio C Hamano committed Nov 4, 2015 at 14:20 UTC 684fea37948d720cc69b3553b42353b4b42709dc

No changes.