Merge branch 'nd/glossary-content-pathspec-markup'
commit34f4a75f1efb9804553802b8cf6b0f6dc6e5e6c4
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Dec 2013 19:41:52 +0000 (3 11:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Dec 2013 19:41:52 +0000 (3 11:41 -0800)
treedc749e32b4f4f85041488742c6ce6976f5efde3e
parent0b6f39b06099a62e43deb78db624be5988bcf280
parent746be68d31b87422b89ac91ffb7699ab3f39f70f
Merge branch 'nd/glossary-content-pathspec-markup'

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