joyplus/joyplus-cms — pull request #397 by xiaoyunqiang (2013-09-27 06:04:46+00:00)
Title: merge 之后的

issue #394 #388