eduStack/configuration — pull request #6 by fmyzjs (2014-08-27 01:42:47+00:00)
Title: merge edx_master@2014.08.27

merge edx_master@2014.08.27