Merge branch 'sb/glossary-submodule' into maint

* sb/glossary-submodule: glossary: add "remote", "submodule", "superproject"

Junio C Hamano committed Jun 16, 2015 at 14:33 UTC 6de4c808391ffff01185c093d6c46f2861f48862

No changes.