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:
Ivan Malison 2013-03-25 14:32:28 -07:00
commit 1c0e86f017

Diff Content Not Available