revert 6c09c5a07bf9de5016659912eefeeb6bef5eb213

Signed-off-by: Zhang Yi <zhangyi.cn@gmail.com>
Merge branch 'master' of github.com:dorentus/.local_conf