Merge branch 'master' of github.com:github/linguist

lib/linguist/languages.yml

@@ -75,6 +75,14 @@ Assembly:
   extensions:
   - .asm
 
+AutoHotkey:
+  type: programming
+  lexer: autohotkey
+  aliases:
+  - ahk
+  extensions:
+  - .ahk
+
 Batchfile:
   type: programming
   group: Shell
@@ -929,6 +937,13 @@ Textile:
   extensions:
   - .textile
 
+Twig:
+  type: markup
+  group: PHP
+  lexer: HTML+Django/Jinja
+  extensions:
+  - .twig
+
 VHDL:
   type: programming
   lexer: Text only

test/test_blob.rb

@@ -341,6 +341,9 @@ class TestBlob < Test::Unit::TestCase
     assert_equal Language['Groovy Server Pages'], blob("hello-resources.gsp").language
     assert_equal Language['Groovy Server Pages'], blob("hello-pagedirective.gsp").language
     assert_equal Language['Groovy Server Pages'], blob("hello-var.gsp").language
+
+    # https://github.com/Lexikos/AutoHotkey_L
+    assert_equal Language['AutoHotkey'], blob("hello.ahk").language
   end
 
   def test_lexer