edx/configuration — pull request #630 by jbau (2014-01-13 23:09:45+00:00)
Title: Edx west/release merge

@jrbl