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

diff --git a/vendor/gems/rspec-1.3.1/Ruby1.9.rdoc b/vendor/gems/rspec-1.3.1/Ruby1.9.rdoc
deleted file mode 100644
index e42cc85e4..000000000
--- a/vendor/gems/rspec-1.3.1/Ruby1.9.rdoc
+++ /dev/null
@@ -1,31 +0,0 @@
-= RSpec and Ruby 1.9
-
-RSpec runs on Ruby 1.9.1 with the following caveats.
-
-== Test::Unit
-
-RSpec/Test::Unit interop will run with the test-unit-1.2.3 gem, but you must install it.
-
-== Class Variables
-
-Due to changes in scoping rules, class variables within example groups are not
-supported in Ruby 1.9.
-
-    describe "a class variable" do
-      @@class_variable = "a class variable"
-  
-      it "can access class variables in examples in Ruby 1.8" do
-        with_ruby 1.8 do
-          @@class_variable.should == "a class variable"
-        end
-      end
-  
-      it "can NOT access class variables in examples in Ruby 1.9" do
-        with_ruby 1.9 do
-          lambda do
-            @@class_variable.should == "a class variable"
-          end.should raise_error(NameError)
-        end
-      end
-    end
-