edx/edx-platform — pull request #4982 by lamagnifica (2014-08-26 20:32:40+00:00)
Title: Ahodges/doc/doc839

@sarina , @srpearce , @njdup, apologies for the short turnaround, but I'd like to merge this midday tomorrow if possible