Merge branch 'release/0.5.1'

Conflicts:
	README.md

1 files changed, 3 insertions, 3 deletions

diff --git a/spec/helpers/link_to_helper_spec.rb b/spec/helpers/link_to_helper_spec.rb
index 3fa91a8f8..f11f2b5bb 100644
--- a/spec/helpers/link_to_helper_spec.rb
+++ b/spec/helpers/link_to_helper_spec.rb
@@ -28,13 +28,13 @@ describe LinkToHelper do
 
     describe "when appending something to a URL" do
         it 'should append to things without query strings' do
-            main_url('/a', '.json').should == 'http://test.localdomain/a.json'
+            main_url('/a', '.json').should == 'http://test.host/a.json'
         end
         it 'should append to things with query strings' do
-            main_url('/a?z=1', '.json').should == 'http://test.localdomain/a.json?z=1'
+            main_url('/a?z=1', '.json').should == 'http://test.host/a.json?z=1'
         end
         it 'should fail silently with invalid URLs' do
-            main_url('/a?z=9%', '.json').should == 'http://test.localdomain/a?z=9%'
+            main_url('/a?z=9%', '.json').should == 'http://test.host/a?z=9%'
         end
     end