Merge branch 'release/0.6'0.6

Conflicts:
	locale/bs/app.po
	locale/ca/app.po
	locale/cs/app.po
	locale/cy/app.po
	locale/de/app.po
	locale/en_IE/app.po
	locale/es/app.po
	locale/eu/app.po
	locale/fr/app.po
	locale/ga_IE/app.po
	locale/gl/app.po
	locale/hu_HU/app.po
	locale/id/app.po
	locale/pt_BR/app.po
	locale/sq/app.po
	locale/sr@latin/app.po
	spec/fixtures/locale/en/app.po

1 files changed, 0 insertions, 78 deletions

diff --git a/vendor/gems/rspec-rails-1.3.3/spec/spec_helper.rb b/vendor/gems/rspec-rails-1.3.3/spec/spec_helper.rb
deleted file mode 100644
index b450d8a7d..000000000
--- a/vendor/gems/rspec-rails-1.3.3/spec/spec_helper.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-$LOAD_PATH.unshift '../rspec/lib'
-$LOAD_PATH.unshift '../../../'
-$LOAD_PATH.unshift 'spec/resources/controllers'
-$LOAD_PATH.unshift 'spec/resources/helpers'
-
-require '../../../spec/spec_helper'
-
-require 'spec/resources/controllers/application'
-require 'spec/resources/controllers/render_spec_controller'
-require 'spec/resources/controllers/controller_spec_controller'
-require 'spec/resources/controllers/rjs_spec_controller'
-require 'spec/resources/controllers/redirect_spec_controller'
-require 'spec/resources/controllers/action_view_base_spec_controller'
-require 'spec/resources/helpers/addition_helper'
-require 'spec/resources/helpers/explicit_helper'
-require 'spec/resources/helpers/more_explicit_helper'
-require 'spec/resources/helpers/view_spec_helper'
-require 'spec/resources/helpers/plugin_application_helper'
-require 'spec/resources/models/animal'
-require 'spec/resources/models/person'
-require 'spec/resources/models/thing'
-
-unless ActionController::Routing.controller_paths.include?('spec/resources/controllers')
-  ActionController::Routing.instance_eval {@possible_controllers = nil}
-  ActionController::Routing.controller_paths << 'spec/resources/controllers'
-end
-
-module Spec
-  module Rails
-    module Example
-      class ViewExampleGroupController
-        prepend_view_path 'spec/resources/views'
-      end
-    end
-  end
-end
-
-def fail()
-  raise_error(Spec::Expectations::ExpectationNotMetError)
-end
-  
-def fail_with(message)
-  raise_error(Spec::Expectations::ExpectationNotMetError,message)
-end
-
-class Proc
-  def should_pass
-    lambda { self.call }.should_not raise_error
-  end
-end
-
-ActionController::Routing::Routes.draw do |map|
-  map.connect 'action_with_method_restriction', :controller => 'redirect_spec', :action => 'action_with_method_restriction', :conditions => { :method => :get }
-  map.connect 'action_to_redirect_to_action_with_method_restriction', :controller => 'redirect_spec', :action => 'action_to_redirect_to_action_with_method_restriction'
-
-  map.resources :rspec_on_rails_specs
-  map.custom_route 'custom_route', :controller => 'custom_route_spec', :action => 'custom_route'
-  map.connect ':controller/:action/:id'
-end
-
-module HelperMethods
-  def method_in_module_included_in_configuration
-  end
-end
-
-module HelperMacros
-  def accesses_configured_helper_methods
-    it "has access to methods in modules included in configuration" do
-      method_in_module_included_in_configuration
-    end
-  end
-end
-
-Spec::Runner.configure do |config|
-  config.include HelperMethods
-  config.extend HelperMacros
-end
-