update from vps
Merge branch 'master' of github.com:cherrot/dotfiles
Merge branch 'master' of github.com:cherrot/dotfiles
Merge branch 'master' of github.com:cherrot/dotfiles
update mysql configuration
Merge branch 'master' of github.com:cherrot/dotfiles