Merge branch 'master' into benchmarking

Conflicts:
	lib/linguist/version.rb
This commit is contained in:
Arfon Smith
2014-07-23 11:01:16 -05:00

View File

@@ -1,3 +1,3 @@
module Linguist
VERSION = "3.0.4"
VERSION = "3.1.0"
end