Merge remote-tracking branch 'remotes/github/master'

This commit is contained in:
ibuler 2015-06-11 14:05:16 +08:00
commit ce8e1e0ae3

File diff suppressed because one or more lines are too long