From adc813feee14df5ea41bbff2791c827809594160 Mon Sep 17 00:00:00 2001
From: Bartosz Blimke <bartosz.blimke@gmail.com>
Date: Sun, 2 Mar 2014 21:06:02 +0100
Subject: [PATCH] Version bump to 1.17.4

---
 CHANGELOG.md           | 6 ++++++
 README.md              | 1 +
 lib/webmock/version.rb | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3acfc4e61..95aa95009 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.17.4
+
+* Update matchers for RSpec 3's matcher protocol
+
+  Thanks to [Rob Olson](https://github.com/robolson)
+
 ## 1.17.3
 
 * Fixed issue with Rack response removing 'Content-Type' header
diff --git a/README.md b/README.md
index 35c0c99f8..19214bcff 100644
--- a/README.md
+++ b/README.md
@@ -881,6 +881,7 @@ People who submitted patches and new features or suggested improvements. Many th
 * Praveen Arimbrathodiyil
 * Bo Jeanes
 * Matthew Conway
+* Rob Olson
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.
diff --git a/lib/webmock/version.rb b/lib/webmock/version.rb
index 0c34cdaff..e2ab55380 100644
--- a/lib/webmock/version.rb
+++ b/lib/webmock/version.rb
@@ -1,3 +1,3 @@
 module WebMock
-  VERSION = '1.17.3' unless defined?(::WebMock::VERSION)
+  VERSION = '1.17.4' unless defined?(::WebMock::VERSION)
 end