Merge branch 'rc/2013-10-23' of https://github.com/edx/edx-platform into rc/2013-10-23
Fixed a bug where legacy instructor dash email editor failed to load