edx/configuration — pull request #1495 by hkim823 (2014-08-28 15:56:32+00:00)
Title: Release...rc/kifli

Merging in changes from rc/kifli to the release branch of configureation