done strikethrough
Merge branch 'master' of github.com:12foo/emacsd