Merge branch 'release/0.13'0.13

Conflicts:
    locale/bg/app.po
    locale/es/app.po
    locale/fi/app.po
    locale/fr/app.po
    locale/fr_CA/app.po
    locale/he_IL/app.po
    locale/hr/app.po
    locale/nb_NO/app.po
    locale/nl/app.po
    locale/pt_BR/app.po
    locale/ro_RO/app.po
    locale/sl/app.po
    locale/vi/app.po
    script/rails-post-deploy

1 files changed, 1 insertions, 1 deletions

diff --git a/spec/models/public_body_spec.rb b/spec/models/public_body_spec.rb
index e17cf8e63..90affaaaa 100644
--- a/spec/models/public_body_spec.rb
+++ b/spec/models/public_body_spec.rb
@@ -468,7 +468,7 @@ end
 
 describe PublicBody, " when override all public body request emails set" do
     it "should return the overridden request email" do
-        MySociety::Config.should_receive(:get).with("OVERRIDE_ALL_PUBLIC_BODY_REQUEST_EMAILS", "").twice.and_return("catch_all_test_email@foo.com")
+        AlaveteliConfiguration.should_receive(:override_all_public_body_request_emails).twice.and_return("catch_all_test_email@foo.com")
         @geraldine = public_bodies(:geraldine_public_body)
         @geraldine.request_email.should == "catch_all_test_email@foo.com"
     end