Merge branch 'nd/glossary-content-pathspec-markup' into maint

* nd/glossary-content-pathspec-markup: glossary-content.txt: fix documentation of "**" patterns

Junio C Hamano committed Dec 17, 2013 at 11:36 UTC 212607494dee5f32667c548259e6347070312b4f

No changes.