# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1363083705 0
# Node ID c212850aec6e5dff0be66cb1b229b3ad8da72165
# Parent  17305097e652826ebe7afd482cccd73c8b380034# Parent  68a94715fb56b89c5158e08d28a1824e39ca8cf3
Merge from branch "live"

diff -r 17305097e652 -r c212850aec6e config/environment.rb
--- a/config/environment.rb	Tue Mar 12 10:21:36 2013 +0000
+++ b/config/environment.rb	Tue Mar 12 10:21:45 2013 +0000
@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.15' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.17' unless defined? RAILS_GEM_VERSION
 
 if RUBY_VERSION >= '1.9'
   Encoding.default_external = 'UTF-8'