Merge branch 'sb/glossary-submodule' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Jun 2015 21:33:51 +0000 (14:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Jun 2015 21:33:51 +0000 (14:33 -0700)
* sb/glossary-submodule:
glossary: add "remote", "submodule", "superproject"

Trivial merge