From a59ba1a8e0a44d7c0589f84b6b1cb923122b6161 Mon Sep 17 00:00:00 2001
From: Marta Paciorkowska <marta@paciorkowska.pl>
Date: Sun, 30 Nov 2014 15:49:17 +0100
Subject: [PATCH] v0.2.4

---
 CHANGELOG.md | 5 +++++
 metadata.rb  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41f5f97..44f17ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Change History
 ==============
 
+0.2.4
+-----
+
+ - Merge #1 (@raoulwissink)
+
 0.2.3
 -----
  - Fix bugs
diff --git a/metadata.rb b/metadata.rb
index 139226e..b33c09a 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,6 +4,6 @@
 license          'MIT'
 description      "SSL key & certificate storage in chef-vault"
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.2.3'
+version          '0.2.4'
 
 supports 'ubuntu'