Mmmm.
Merge branch 'master' of github.com:gorakhargosh/gemacs