edx/configuration — pull request #1040 by e0d (2014-04-25 14:43:14+00:00)
Title: E0d/preview

Branch re-based against release with unrelated commits from master removed.