Merge branch 'sb/glossary-submodule'
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Jun 2015 16:29:57 +0000 (09:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Jun 2015 16:29:57 +0000 (09:29 -0700)
* sb/glossary-submodule:
glossary: add "remote", "submodule", "superproject"

Trivial merge