Merge branch 'master' into http

Conflicts:
	.gitmodules
This commit is contained in:
Arfon Smith
2015-01-08 13:13:07 -06:00
42 changed files with 1617 additions and 78 deletions

1
vendor/grammars/Sublime-Nit vendored Submodule

1
vendor/grammars/carto-atom vendored Submodule

1
vendor/grammars/language-hy vendored Submodule