Merge branch 'master' into auto

Conflicts:
	.gitmodules
This commit is contained in:
Arfon Smith
2015-01-08 17:00:45 -06:00
43 changed files with 1624 additions and 79 deletions

1
vendor/grammars/Sublime-HTTP vendored Submodule

1
vendor/grammars/Sublime-Nit vendored Submodule

1
vendor/grammars/carto-atom vendored Submodule

1
vendor/grammars/language-hy vendored Submodule