tentative
Merge branch 'master' of github.com:tosh914/emacsd