edx/edx-platform — pull request #6223 by martynjames (2014-12-11 18:08:33+00:00)
Title: Merge feature SOL-20

This is a pull request to merge the SOL-20 feature (https://openedx.atlassian.net/browse/SOL-20).