Erc, ssh
Merge branch 'master' of github.com:pimeys/emacs.d