Fix tests and merge master

1 files changed, 10 insertions, 0 deletions

diff --git a/bin/rails b/bin/rails
new file mode 100755
index 000000000..9587c07f0
--- /dev/null
+++ b/bin/rails
@@ -0,0 +1,10 @@
+#!/usr/bin/env jruby
+begin
+  load File.expand_path("../spring", __FILE__)
+rescue LoadError
+end
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'