Merge branch 'nd/glossary-content-pathspec-markup' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Dec 2013 19:36:54 +0000 (11:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Dec 2013 19:36:54 +0000 (11:36 -0800)
* nd/glossary-content-pathspec-markup:
glossary-content.txt: fix documentation of "**" patterns

Trivial merge