Merge remote-tracking branch 'upstream/master'

lib/linguist/languages.yml

@@ -390,7 +390,7 @@ Groovy Server Pages:
   group: Groovy
   lexer: Java Server Page
   overrides:
-  - .gsp  
+  - .gsp
   aliases:
   - gsp
   extensions:
@@ -451,6 +451,7 @@ INI:
   extensions:
   - .cfg
   - .ini
+  - .prefs
   - .properties
   filenames:
   - .gitconfig
@@ -996,6 +997,9 @@ XML:
   - .xsd
   - .xsl
   - .xul
+  filenames:
+  - .classpath
+  - .project
 
 XQuery:
   type: programming

linguist.gemspec

@@ -8,6 +8,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'escape_utils', '0.2.3'
   s.add_dependency 'mime-types',   '1.16'
-  s.add_dependency 'pygments.rb',  '~> 0.2.0'
+  s.add_dependency 'pygments.rb',  '~> 0.2.1'
   s.add_development_dependency 'rake'
 end