Prepare 2.5.0 release

willdurand · willdurand · commit 50e54f88b539 · 2014-05-16T11:11:44.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,13 @@
 CHANGELOG
 =========
 
-### 2.4.3 (????-??-??) ###
+### 2.5.0 (2014-05-16) ###
 
-n/a
+* Added: ability to set timeouts for `CurlHttpAdapter`
+* Added: support for a Google Maps API key
+* Added: premium support to `GeocoderCaProvider` + tests
+* Added: test against `hhvm-nightly` on Travis-CI
+* Updated: documentation
 
 ### 2.4.2 (2014-01-05) ###
 
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev"
+            "dev-master": "2.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 = '2.4.3-dev';
+    const VERSION = '2.5.0';
 
     /**
      * @var integer
