Merge branch 'yd/doc-merge-annotated-tag' into maint

* yd/doc-merge-annotated-tag: Documentation: merging a tag is a special case

Junio C Hamano committed Apr 1, 2013 at 09:19 UTC ab24e7521c1027f7d86722345422ec92a5dde659

No changes.