From e850c7ddba1d08157b9628f6dfed7626ef4407df Mon Sep 17 00:00:00 2001
From: Michael Dowling <mtdowling@gmail.com>
Date: Fri, 7 Sep 2012 10:24:07 -0700
Subject: [PATCH] [Service] Fixing config file aliases for JSON includes

---
 src/Guzzle/Service/JsonLoader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Guzzle/Service/JsonLoader.php b/src/Guzzle/Service/JsonLoader.php
index 0cee96b0..96d0f9e1 100644
--- a/src/Guzzle/Service/JsonLoader.php
+++ b/src/Guzzle/Service/JsonLoader.php
@@ -59,7 +59,7 @@ class JsonLoader
         // Handle includes
         if (!empty($data['includes'])) {
             foreach ($data['includes'] as $path) {
-                if ($path[0] != DIRECTORY_SEPARATOR) {
+                if ($path[0] != DIRECTORY_SEPARATOR && !isset($this->aliases[$path])) {
                     $path = dirname($jsonFile) . DIRECTORY_SEPARATOR . $path;
                 }
                 $data = $this->mergeJson($this->parseJsonFile($path), $data);