From cd9964edbe1e471619ac44254f709420f7a398f2 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Sat, 7 Sep 2013 13:12:31 -0700
Subject: [PATCH] prep

---
 CHANGELOG.md                                 | 18 ++++++++++++++++++
 Gemfile                                      |  2 +-
 middleman-core/lib/middleman-core/version.rb |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b562ed46..054b88bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,24 @@
 master
 ===
 
+3.1.5
+===
+
+* Escape filenames in regexes. Fixes #942.
+* Create automated alt tag addition, based on image name.
+* Add listener latency option. (Aliased to -l)
+* Add support/tests for Redcarpet 3.0.0 features
+  - :underline
+  - :highlight
+  - :disable_indented_code_blocks
+*  Fix support for
+  - :link_attributes
+  - :filter_html
+
+3.1.4
+===
+
+* Support kramdown 1.1
 * Support redcarpet's :no_links & :no_images. #951
 
 3.1.3
diff --git a/Gemfile b/Gemfile
index 30603233..25460022 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ gem "haml", "~> 4.0.0", :require => false # Make sure to use Haml 4 for tests
 gem "sinatra", :require => false
 gem "slim", :require => false
 gem "liquid", :require => false
-gem "less", :require => false
+gem "less", "~> 2.3.0", :require => false
 gem "stylus", :require => false
 
 # gem "pry", :require => false
diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb
index 7016bb48..b0fe07dc 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.1.4' unless const_defined?(:VERSION)
+  VERSION = '3.1.5' unless const_defined?(:VERSION)
 end