From f5a009fe4474023852f4c6043b2a6d400f93b2f6 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <tdreyno@gmail.com>
Date: Wed, 20 Apr 2011 13:41:38 -0700
Subject: [PATCH] Fix error when using relative_assets and
 automatic_image_sizes. Thanks @zlz. Closes #35

---
 lib/middleman/features/automatic_image_sizes.rb | 6 ++----
 lib/middleman/version.rb                        | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/middleman/features/automatic_image_sizes.rb b/lib/middleman/features/automatic_image_sizes.rb
index 022569c8..934c8ddb 100755
--- a/lib/middleman/features/automatic_image_sizes.rb
+++ b/lib/middleman/features/automatic_image_sizes.rb
@@ -23,11 +23,9 @@ module Middleman::Features::AutomaticImageSizes
           end
         rescue
         end
-
-        super(asset_url(path, http_prefix), params)
-      else
-        super(path, params)
       end
+      
+      super(path, params)
     end
   end
 end
\ No newline at end of file
diff --git a/lib/middleman/version.rb b/lib/middleman/version.rb
index 6feea0ce..0b7930f6 100644
--- a/lib/middleman/version.rb
+++ b/lib/middleman/version.rb
@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end