yangchunwen/zhaoxi — pull request #1 by yangchunwen (2014-09-13 15:40:21+00:00)
Title: merge

merge trunk