edx/edx-platform — pull request #4057 by louyihua (2014-06-11 15:51:21+00:00)
Title: Do not merge zh-hk into zh-tw in darklang

#4055