edx/edx-platform — pull request #1943 by mhoeber (2013-12-13 00:50:08+00:00)
Title: Markhoeber/documentation/glossary

trying to fix merge issue with sylvia/documentation/bld-556