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, 26 deletions

diff --git a/vendor/gems/rspec-rails-1.3.3/lib/spec/rails.rb b/vendor/gems/rspec-rails-1.3.3/lib/spec/rails.rb
deleted file mode 100644
index 2a20d70b5..000000000
--- a/vendor/gems/rspec-rails-1.3.3/lib/spec/rails.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-begin
-  require_dependency 'application_controller'
-rescue MissingSourceFile
-  require_dependency 'application'
-end
-require 'rack/utils'
-
-require 'action_controller/test_process'
-require 'action_controller/integration'
-require 'active_support/test_case'
-require 'active_record/fixtures' if defined?(ActiveRecord::Base)
-
-require 'spec/test/unit'
-
-require 'spec/rails/matchers'
-require 'spec/rails/mocks'
-require 'spec/rails/example'
-require 'spec/rails/extensions'
-require 'spec/rails/interop/testcase'
-
-Spec::Example::ExampleGroupFactory.default(ActiveSupport::TestCase)
-
-if ActionView::Base.respond_to?(:cache_template_extensions)
-  ActionView::Base.cache_template_extensions = false
-end
-