123
Merge branch 'master' of github.com:csophys/emacs.d
make it work in windows~