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

diff --git a/vendor/gems/rspec-rails-1.3.3/README.rdoc b/vendor/gems/rspec-rails-1.3.3/README.rdoc
deleted file mode 100644
index 06360d905..000000000
--- a/vendor/gems/rspec-rails-1.3.3/README.rdoc
+++ /dev/null
@@ -1,48 +0,0 @@
-= Spec::Rails
-
-* http://rspec.info
-* http://rubyforge.org/projects/rspec
-* http://github.com/dchelimsky/rspec-rails
-* http://wiki.github.com/dchelimsky/rspec/rails
-* mailto:rspec-devel@rubyforge.org
-
-== DESCRIPTION:
-
-Behaviour Driven Development for Ruby on Rails.
-
-rspec-rails is an RSpec extension that allows you to drive the development of
-Ruby on Rails applications with RSpec.
-
-This is the repository for rspec-rails-1.x. If you're looking
-for rspec-rails-2 for rails-3, see http://github.com/rspec/rspec-rails.
-
-== FEATURES:
-
-* Use RSpec to independently specify Rails Models, Views, Controllers and Helpers
-* Integrated fixture loading
-* Special generators for Resources, Models, Views and Controllers that generate RSpec code examples.
-
-== VISION:
-
-For people for whom TDD is a brand new concept, the testing support built into
-Ruby on Rails is a huge leap forward. The fact that it is built right in is
-fantastic, and Ruby on Rails apps are generally much easier to maintain than
-they might have been without such support.
-
-For those of us coming from a history with TDD, and now BDD, the existing
-support presents some problems related to dependencies across examples. To
-that end, RSpec on Rails supports 4 types of examples. We’ve also built in
-first class mocking and stubbing support in order to break dependencies across
-these different concerns.
-
-== MORE INFORMATION:
-
-See Spec::Rails::Example for information about the different kinds of example
-groups you can use to spec the different Rails components
-
-See Spec::Rails::Matchers for information about Rails-specific
-expectations you can set on responses and models, etc.
-
-== INSTALL
-
-* Visit http://wiki.github.com/dchelimsky/rspec/rails for installation instructions.