fix a time mistake
Merge branch 'angularjs' into gh-pages