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/README.rdoc b/vendor/gems/rspec-1.3.1/README.rdoc
deleted file mode 100644
index 523fa6af1..000000000
--- a/vendor/gems/rspec-1.3.1/README.rdoc
+++ /dev/null
@@ -1,41 +0,0 @@
-== RSpec
-
-http://rspec.info
-
-Behaviour Driven Development for Ruby
-
-This is the repository for rspec-1.x. If you're looking
-for rspec-2 (and if you're not, what are you waiting for?),
-see http://github.com/rspec/rspec
-
-== Install
-
-  gem install rspec
-
-== Synopsis
-
-  describe Account do
-    context "transfering money" do
-      it "deposits transfer amount to the other account" do
-        source = Account.new(50, :USD)
-        target = mock('target account')
-        target.should_receive(:deposit).with(Money.new(5, :USD))
-        source.transfer(5, :USD).to(target)
-      end
-
-      it "reduces its balance by the transfer amount" do
-        source = Account.new(50, :USD)
-        target = stub('target account')
-        source.transfer(5, :USD).to(target)
-        source.balance.should == Money.new(45, :USD)
-      end
-    end
-  end
-  
-  $ spec ./spec/account_spec.rb --format nested
-  Account
-    transfering money
-      deposits transfer amount to the other account
-      reduces its balance by the transfer amount
-    
-  2 examples, 0 failures