From 69e39105266535e03631538df97464bc987452fc Mon Sep 17 00:00:00 2001
From: William DURAND <william.durand1@gmail.com>
Date: Tue, 22 Oct 2013 15:10:06 +0200
Subject: [PATCH] Prepare 2.3.1 release

---
 CHANGELOG.md              | 5 +++--
 src/Geocoder/Geocoder.php | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2e32cb7a..035180cfd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,10 @@
 CHANGELOG
 =========
 
-### 2.3.1 (????-??-??) ###
+### 2.3.1 (2013-10-22) ###
 
-n/a
+* Fixed: GeoipProvider and MaxMindBinaryProvider now return a result set
+* Added: fixEncoding() method in AbstractProvider (merged from 1.7)
 
 ### 2.3.0 (2013-10-17) ###
 
diff --git a/src/Geocoder/Geocoder.php b/src/Geocoder/Geocoder.php
index 68c7d24bd..9b8c86e12 100644
--- a/src/Geocoder/Geocoder.php
+++ b/src/Geocoder/Geocoder.php
@@ -22,7 +22,7 @@ class Geocoder implements GeocoderInterface
     /**
      * Version
      */
-    const VERSION = '2.3.1-dev';
+    const VERSION = '2.3.1';
 
     /**
      * @var integer