From b249289b9d01091d0423f869a4fc9d07ebf0c283 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 13 Apr 2013 16:40:05 +0200
Subject: [PATCH] Set the timezone for the process

---
 lib/jekyll.rb               | 16 +++++++++++++++-
 lib/jekyll/configuration.rb |  2 ++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index d8eb7a54..f4bea173 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -73,6 +73,20 @@ module Jekyll
     config = config.read_config_files(config.config_files(override))
 
     # Merge DEFAULTS < _config.yml < override
-    config.deep_merge(override).stringify_keys
+    config = config.deep_merge(override).stringify_keys
+    set_timezone(config)
+
+    config
+  end
+
+  # Static: Set the TZ environment variable to use the timezone specified
+  #
+  # config - the Jekyll::Configuration generated by Jekyll.configuration
+  #
+  # Returns nothing
+  def self.set_timezone(config)
+    if config['timezone']
+      ENV['TZ'] = config['timezone']
+    end
   end
 end
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 9433a015..7d676bfd 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -10,6 +10,8 @@ module Jekyll
       'layouts'       => '_layouts',
       'keep_files'    => ['.git','.svn'],
 
+      'timezone'      => nil             # use the local timezone
+
       'safe'          => false,
       'show_drafts'   => nil,
       'limit_posts'   => nil,