From af486d7d2acf36d2d1d6280bc3e8685a07f8bc42 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 24 Mar 2015 09:14:33 -0700
Subject: [PATCH] prep

---
 CHANGELOG.md                                 | 7 +++++++
 middleman-core/lib/middleman-core/version.rb | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6316a485..37ad1063 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 master
 ===
 
+3.3.11
+===
+* Add jruby to the list of envs requiring tzinfo-data.
+* Don't lookup resource for path if the path is absolute. Fixes #1195
+* Make preview host and port configurable in config.rb and also expose those variables to extensions which are curious. Closes #1477
+* Append assets hash to .woff2 files
+
 3.3.10
 ===
 * Fixes #1469, missing `cattr_accessor` in Redcarpet support.
diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb
index 782464f2..10156e39 100644
--- a/middleman-core/lib/middleman-core/version.rb
+++ b/middleman-core/lib/middleman-core/version.rb
@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.3.10' unless const_defined?(:VERSION)
+  VERSION = '3.3.11' unless const_defined?(:VERSION)
 end