Merge pull request #1 from WordPress/master

同步2014年8月23日11:16:11
Merge branch 'master' of https://github.com/JamTeam/WordPress
Merge branch 'master' into develop