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

diff --git a/vendor/gems/rspec-1.3.1/lib/spec/runner.rb b/vendor/gems/rspec-1.3.1/lib/spec/runner.rb
deleted file mode 100644
index 519b536e2..000000000
--- a/vendor/gems/rspec-1.3.1/lib/spec/runner.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-require 'spec/runner/configuration'
-require 'spec/runner/options'
-require 'spec/runner/option_parser'
-require 'spec/runner/example_group_runner'
-require 'spec/runner/command_line'
-require 'spec/runner/drb_command_line'
-require 'spec/runner/backtrace_tweaker'
-require 'spec/runner/reporter'
-require 'spec/runner/line_number_query'
-require 'spec/runner/class_and_arguments_parser'
-require 'spec/runner/extensions/kernel'
-
-module Spec
-  module Runner
-    
-    class ExampleGroupCreationListener
-      def register_example_group(klass)
-        Spec::Runner.options.add_example_group klass
-      end
-    end
-    
-    Spec::Example::ExampleGroupFactory.example_group_creation_listeners << ExampleGroupCreationListener.new
-    
-    class << self
-      def configuration # :nodoc:
-        @configuration ||= Spec::Runner::Configuration.new
-      end
-
-      # Use this to configure various configurable aspects of
-      # RSpec:
-      #
-      #   Spec::Runner.configure do |configuration|
-      #     # Configure RSpec here
-      #   end
-      #
-      # The yielded <tt>configuration</tt> object is a
-      # Spec::Runner::Configuration instance. See its RDoc
-      # for details about what you can do with it.
-      #
-      def configure
-        yield configuration
-      end
-      
-      def autorun # :nodoc:
-        at_exit {exit run unless $!}
-      end
-
-      def options # :nodoc:
-        @options ||= begin
-          parser = ::Spec::Runner::OptionParser.new($stderr, $stdout)
-          parser.order!(ARGV)
-          parser.options
-        end
-      end
-    
-      def use options
-        @options = options
-      end
-
-      def run
-        options.examples_run? || options.run_examples
-      end
-
-    end
-  end
-end
\ No newline at end of file