From a31780a1ec03b04bcc983e12e0bea7f694221946 Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Thu, 10 Mar 2011 21:15:29 -0800
Subject: [PATCH] Move require to jekyll.rb and update history.

---
 History.txt               | 1 +
 lib/jekyll.rb             | 1 +
 lib/jekyll/convertible.rb | 2 --
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/History.txt b/History.txt
index b0d4c35f..57909f73 100644
--- a/History.txt
+++ b/History.txt
@@ -2,6 +2,7 @@
   * Minor Enhancements
     * Switch to Albino gem
     * Bundler support
+    * Use English library to avoid hoops (#292)
   * Bug Fixes
     * Secure additional path exploits
 
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index d6258a61..65bdd7fe 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -19,6 +19,7 @@ require 'rubygems'
 require 'fileutils'
 require 'time'
 require 'yaml'
+require 'English'
 
 # 3rd party
 require 'liquid'
diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 98703a09..cee04b6e 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -1,5 +1,3 @@
-require "English"
-
 # Convertible provides methods for converting a pagelike item
 # from a certain type of markup into actual content
 #