Merge branch 'nd/glossary-content-pathspec-markup' into maint
commit212607494dee5f32667c548259e6347070312b4f
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Dec 2013 19:36:54 +0000 (17 11:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Dec 2013 19:36:54 +0000 (17 11:36 -0800)
tree80bdd2239f1315bbc173d9dcd74746f19f55e1d7
parentc8394bb46667c059f00433224f09bda8de878128
parent746be68d31b87422b89ac91ffb7699ab3f39f70f
Merge branch 'nd/glossary-content-pathspec-markup' into maint

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