Merge branch '1623-local' of github.com:github/linguist into 1623-local

Conflicts:
	lib/linguist/heuristics.rb
This commit is contained in:
Arfon Smith
2014-11-02 20:14:46 -06:00

Diff Content Not Available