Update composer.json

Author: willdurand

composer.json

@@ -18,21 +18,22 @@
         "kriswallsmith/buzz": "@stable",
         "guzzle/guzzle": "@stable",
         "zendframework/zendframework": "~2.1",
-        "maxromanovsky/php-maxmind-geoip": "~1.12"
+        "geoip/geoip": "~1.13"
     },
     "suggest": {
         "kriswallsmith/buzz": "Enabling Buzz allows you to use the BuzzHttpAdapter.",
-        "ext-curl": "Enabling the curl extension allows you to use CurlHttpAdapter.",
+        "ext-curl": "Enabling the curl extension allows you to use the CurlHttpAdapter.",
+        "ext-geoip": "Enabling the geoip extension allows you to use the MaxMindProvider.",
         "guzzle/guzzle": "Enabling Guzzle allows you to use the GuzzleHttpAdapter.",
         "zendframework/zend-http": "Enabling Zend Http allows you to use the ZendHttpAdapter.",
-        "maxromanovsky/php-maxmind-geoip": "If you are going to use MaxMindBinaryProvider."
+        "geoip/geoip": "If you are going to use the MaxMindBinaryProvider (conflict with geoip extension)."
     },
     "autoload": {
         "psr-0": { "Geocoder": "src/" }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.6-dev"
+            "dev-master": "1.7-dev"
         }
     }
 }