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, 2 insertions, 2 deletions

diff --git a/script/spec_server b/script/spec_server
index 1e839355f..dfdf8ff6c 100755
--- a/script/spec_server
+++ b/script/spec_server
@@ -41,7 +41,7 @@ module Spec
         load File.dirname(__FILE__) + '/../spec/spec_helper.rb'
 
         if in_memory_database?
-          load "#{RAILS_ROOT}/db/schema.rb" # use db agnostic schema by default
+          load "#{Rails.root}/db/schema.rb" # use db agnostic schema by default
           ActiveRecord::Migrator.up('db/migrate') # use migrations
         end
 
@@ -80,7 +80,7 @@ def daemonize(pid_file = nil)
   return yield if $DEBUG
   pid = Process.fork{
     Process.setsid
-    Dir.chdir(RAILS_ROOT)
+    Dir.chdir(Rails.root)
     trap("SIGINT"){ exit! 0 }
     trap("SIGTERM"){ exit! 0 }
     trap("SIGHUP"){ restart_test_server }