2013-10-23 修改github的链接地址
Merge remote-tracking branch 'origin/master'