Prepare release 1.5.0

willdurand · willdurand · commit 8faba7ef763a · 2013-05-03T09:35:13.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,14 @@
 CHANGELOG
 =========
 
-### 1.4.1 (????-??-??) ###
-
-n/a
+### 1.5.0 (2013-05-03) ###
+
+* Added: DefaultResultFactory and MultipleResultFactory classes - Fix #223
+* Fixed: provider's tests
+* Fixed: encoding for geoip provider
+* fixed: inspection values
+* Fixed: tests and enhanced test cover
+* Fixed: branch-alias (composer)
 
 ### 1.4.0 (2013-03-16) ###
 
diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.4-dev"
+            "dev-master": "1.5-dev"
         }
     }
 }
diff --git a/src/Geocoder/Geocoder.php b/src/Geocoder/Geocoder.php
@@ -22,7 +22,7 @@ class Geocoder implements GeocoderInterface
     /**
      * Version
      */
-    const VERSION = '1.4.1-dev';
+    const VERSION = '1.5.0';
 
     /**
      * @var ProviderInterface[]
