hexojs/hexo — pull request #970 by slfmessi (2014-12-28 11:19:29+00:00)
Title: Merge pull request #1 from hexojs/master

Merge