From 3c70fffb6765071e7ac09302961416d0a5a0e34d Mon Sep 17 00:00:00 2001
From: Garen Torikian <gjtorikian@gmail.com>
Date: Tue, 24 Sep 2013 16:32:02 -0700
Subject: [PATCH] Add Org

---
 lib/linguist/language.rb   | 2 +-
 lib/linguist/languages.yml | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/linguist/language.rb b/lib/linguist/language.rb
index 1b9ed814..c64344b4 100644
--- a/lib/linguist/language.rb
+++ b/lib/linguist/language.rb
@@ -25,7 +25,7 @@ module Linguist
     #
     # Returns an array
     def self.detectable_markup
-      ["CSS", "Less", "Sass", "Markdown", "Textile", "reStructuredText", "AsciiDoc", "RDoc"]
+      ["CSS", "Less", "Sass", "Markdown", "Textile", "reStructuredText", "AsciiDoc", "RDoc", "Org"]
     end
 
     # Internal: Create a new Language object
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 7b8109b1..493e807c 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -974,6 +974,12 @@ OpenEdge ABL:
   - abl
   primary_extension: .p
 
+Org:
+  type: markup
+  lexer: Text only
+  wrap: true
+  primary_extension: .org
+
 PHP:
   type: programming
   ace_mode: php