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, 0 insertions, 6 deletions

diff --git a/spec/controllers/help_controller_spec.rb b/spec/controllers/help_controller_spec.rb
index c47e1abd3..cc024f840 100644
--- a/spec/controllers/help_controller_spec.rb
+++ b/spec/controllers/help_controller_spec.rb
@@ -31,17 +31,11 @@ describe HelpController, "when using help" do
     describe 'when requesting a page in a supported locale ' do
 
         before do
-            # Allow us to supply the locale manually
-            RoutingFilter.active = false
             # Prepend our fixture templates
             fixture_theme_path = File.join(Rails.root, 'spec', 'fixtures', 'theme_views', 'theme_one')
             controller.prepend_view_path fixture_theme_path
         end
 
-        after do
-            RoutingFilter.active = true
-        end
-
         it 'should render the locale-specific template if available' do
             get :contact, {:locale => 'es'}
             response.body.should match('contáctenos theme one')