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

2 files changed, 0 insertions, 81 deletions

diff --git a/vendor/gems/rspec-rails-1.3.3/lib/autotest/discover.rb b/vendor/gems/rspec-rails-1.3.3/lib/autotest/discover.rb
deleted file mode 100644
index d3a6fbaaf..000000000
--- a/vendor/gems/rspec-rails-1.3.3/lib/autotest/discover.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-Autotest.add_discovery do
-  style = []
-  style << "rails" if File.exist? 'config/environment.rb'
-  style
-end
\ No newline at end of file
diff --git a/vendor/gems/rspec-rails-1.3.3/lib/autotest/rails_rspec.rb b/vendor/gems/rspec-rails-1.3.3/lib/autotest/rails_rspec.rb
deleted file mode 100644
index 2aa4f5f71..000000000
--- a/vendor/gems/rspec-rails-1.3.3/lib/autotest/rails_rspec.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-# (c) Copyright 2006 Nick Sieger <nicksieger@gmail.com>
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-$:.push(*Dir["vendor/rails/*/lib"])
-
-require 'active_support'
-require 'autotest/rspec'
-
-Autotest.add_hook :initialize do |at|
-  %w{config/ coverage/ db/ doc/ log/ public/ script/ tmp/ vendor/rails vendor/plugins previous_failures.txt}.each do |exception|
-    at.add_exception(exception)
-  end
-  
-  at.clear_mappings
-  
-  at.add_mapping(%r%^(test|spec)/fixtures/(.*).yml$%) { |_, m|
-    ["spec/models/#{m[2].singularize}_spec.rb"] + at.files_matching(%r%^spec\/views\/#{m[2]}/.*_spec\.rb$%)
-  }
-  at.add_mapping(%r%^spec/(models|controllers|routing|views|helpers|lib)/.*rb$%) { |filename, _|
-    filename
-  }
-  at.add_mapping(%r%^app/models/(.*)\.rb$%) { |_, m|
-    ["spec/models/#{m[1]}_spec.rb"]
-  }
-  at.add_mapping(%r%^app/views/(.*)$%) { |_, m|
-    at.files_matching %r%^spec/views/#{m[1]}_spec.rb$%
-  }
-  at.add_mapping(%r%^app/controllers/(.*)\.rb$%) { |_, m|
-    if m[1] == "application"
-      at.files_matching %r%^spec/controllers/.*_spec\.rb$%
-    else
-      ["spec/controllers/#{m[1]}_spec.rb"]
-    end
-  }
-  at.add_mapping(%r%^app/helpers/(.*)_helper\.rb$%) { |_, m|
-    if m[1] == "application" then
-      at.files_matching(%r%^spec/(views|helpers)/.*_spec\.rb$%)
-    else
-      ["spec/helpers/#{m[1]}_helper_spec.rb"] + at.files_matching(%r%^spec\/views\/#{m[1]}/.*_spec\.rb$%)
-    end
-  }
-  at.add_mapping(%r%^config/routes\.rb$%) {
-    at.files_matching %r%^spec/(controllers|routing|views|helpers)/.*_spec\.rb$%
-  }
-  at.add_mapping(%r%^config/database\.yml$%) { |_, m|
-    at.files_matching %r%^spec/models/.*_spec\.rb$%
-  }
-  at.add_mapping(%r%^(spec/(spec_helper|shared/.*)|config/(boot|environment(s/test)?))\.rb$%) {
-    at.files_matching %r%^spec/(models|controllers|routing|views|helpers)/.*_spec\.rb$%
-  }
-  at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m|
-    ["spec/lib/#{m[1]}_spec.rb"]
-  }
-end
-
-class Autotest::RailsRspec < Autotest::Rspec
-end