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

diff --git a/vendor/gems/rspec-1.3.1/lib/spec/deprecation.rb b/vendor/gems/rspec-1.3.1/lib/spec/deprecation.rb
deleted file mode 100644
index 3e3140d47..000000000
--- a/vendor/gems/rspec-1.3.1/lib/spec/deprecation.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-module Spec
-  class << self
-    def deprecate(method, alternate_method=nil)
-      return if Spec::Runner.configuration.suppress_deprecation_warnings?
-      message = <<-NOTICE
-
-*****************************************************************
-DEPRECATION WARNING: you are using deprecated behaviour that will
-be removed from a future version of RSpec.
-
-#{caller(0)[2]}
-
-* #{method} is deprecated.
-NOTICE
-      if alternate_method
-        message << <<-ADDITIONAL
-* please use #{alternate_method} instead.
-ADDITIONAL
-      end
-
-      message << "*****************************************************************"
-      warn(message)
-    end
-
-    def warn(message)
-      Kernel.warn(message)
-    end
-
-  end
-
-  class HashWithDeprecationNotice < Hash
-    def initialize(method, alternate_method=nil, &block)
-      @method, @alternate_method = method, alternate_method
-    end
-    def []=(k,v)
-      Spec.deprecate(@method, @alternate_method)
-      super
-    end
-  end
-end
-