Arfon Smith 212c74d8a3 Merge branch 'master' into cool ...

Conflicts:
	lib/linguist/heuristics.rb
	lib/linguist/languages.yml
	lib/linguist/samples.json

2014-11-30 15:23:09 -06:00

..

linguist

Merge branch 'master' into cool

2014-11-30 15:23:09 -06:00

linguist.rb

consolidate shebang logic

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