less-css-mode
Merge branch 'master' of github.com:tsolar/emacs

Conflicts:
	.gitmodules