oscu/OpenSource-13-06 — pull request #30 by yuyonglucky (2013-06-24 08:40:55+00:00)
Title: 合并

怎么合并主干这么费劲呢，还是用的不熟