Merge pull request #2123 from geekpi/master

translated
This commit is contained in:
geekpi 2014-12-18 22:24:24 +08:00
commit 16bfd25d30