Merge remote-tracking branch 'origin/master' into yelp
* origin/master: Got rid of stupid python-mode, now using python.el. Conflicts: init.el
This commit is contained in:
commit
1c0e86f017
* origin/master: Got rid of stupid python-mode, now using python.el. Conflicts: init.el