Arfon Smith d95b7504ab Merge branch 'master' into tst ...

Conflicts:
	lib/linguist/heuristics.rb
	lib/linguist/language.rb
	lib/linguist/languages.yml

2015-01-23 14:35:27 -06:00

..

linguist

Merge branch 'master' into tst

2015-01-23 14:35:27 -06:00

linguist.rb

consolidate shebang logic

2014-11-27 12:18:23 -05:00