edx/edx-platform — pull request #2251 by ormsbee (2014-01-21 20:20:35+00:00)
Title: Merging Release 2014-01-21

Just going to verify tests don't break before merging.