From 57aabc03faafe072d1c90ac6bd9a837ef6662c92 Mon Sep 17 00:00:00 2001
From: Brian Lopez <seniorlopez@gmail.com>
Date: Wed, 9 Nov 2011 03:01:38 -0800
Subject: [PATCH] bump version for 0.2.14 release

---
 CHANGELOG.md          | 8 +++++++-
 lib/mysql2/version.rb | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e3d7be24..9e921bf3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.2.14 (November 9th, 2011)
+* use rb_wait_for_single_fd() if available
+* fixed a bug with inheriting query options
+* remove ext/ from the default loadpath
+* fix build issues on OSX with Xcode 4.2 (gcc-llvm compiler)
+
 ## 0.2.13 (August 16th, 2011)
 * fix stupid bug around symbol encoding support (thanks coderrr!)
 
@@ -167,4 +173,4 @@
 * updated extconf (thanks to the mysqlplus project) for easier gem building
 
 ## 0.1.0 (April 6th, 2010)
-* initial release
\ No newline at end of file
+* initial release
diff --git a/lib/mysql2/version.rb b/lib/mysql2/version.rb
index 5e173a511..2b319603e 100644
--- a/lib/mysql2/version.rb
+++ b/lib/mysql2/version.rb
@@ -1,3 +1,3 @@
 module Mysql2
-  VERSION = "0.2.13"
-end
\ No newline at end of file
+  VERSION = "0.2.14"
+end