edx/configuration — pull request #939 by jbau (2014-03-28 05:05:09+00:00)
Title: Edx west/merge gugelhupf

Note: NOT to master

@jrbl @sefk just merging the changes from the recent release back in