LCTT/TranslateProject — pull request #471 by whatever1992 (2013-11-25 13:14:55+00:00)
Title: translating by whatever1992

translating

显示
git merge my/master origin/master
Already up-to-date.

这次能合并么？