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

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

Junio C Hamano committed Apr 3, 2013 at 08:36 UTC 0311e373b5f26f89ec65f0fbcebeba4fd68f4ad0

No changes.