From 27c96af2c698915f155f9a230ba6802739e526b0 Mon Sep 17 00:00:00 2001
From: Hans Hasselberg <me@hans.io>
Date: Mon, 3 Nov 2014 21:17:52 +0100
Subject: [PATCH] bump version and add changelog entry.

---
 CHANGELOG.md            | 9 +++++++++
 lib/typhoeus/version.rb | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 878dd915..f8980437 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.7.0.pre1
+
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.6.9...v0.7.0.pre1)
+
+Enhancements:
+
+* Improving timeout behavior and documentation. `no_signal` is now set per default!
+  ([Jonas Wagner](https://github.com/jwagner), [\#398](https://github.com/typhoeus/typhoeus/pull/398)
+
 ## 0.6.8
 
 [Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.6.7...v0.6.8)
diff --git a/lib/typhoeus/version.rb b/lib/typhoeus/version.rb
index 2fbfab9f..a450acc3 100644
--- a/lib/typhoeus/version.rb
+++ b/lib/typhoeus/version.rb
@@ -1,5 +1,5 @@
 module Typhoeus
 
   # The current Typhoeus version.
-  VERSION = '0.6.9'
+  VERSION = '0.7.0.pre1'
 end