# HG changeset patch
# User Chris Cannam
# Date 1371201926 -3600
# Node ID a778eeeeec773ccc0a12dfd9c3f2f789cca2f382
# Parent  44475ccf56d3fd06457f5449e64847c82ab2ad86# Parent  cf4cc816278aa7cc8f39a465f52304f6e91dd34a
Merge from live branch

diff -r 44475ccf56d3 -r a778eeeeec77 config/environment.rb
--- a/config/environment.rb	Tue Mar 12 15:44:39 2013 +0000
+++ b/config/environment.rb	Fri Jun 14 10:25:26 2013 +0100
@@ -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.17' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.18' unless defined? RAILS_GEM_VERSION
 
 if RUBY_VERSION >= '1.9'
   Encoding.default_external = 'UTF-8'
diff -r 44475ccf56d3 -r a778eeeeec77 extra/soundsoftware/SoundSoftware.pm
--- a/extra/soundsoftware/SoundSoftware.pm	Tue Mar 12 15:44:39 2013 +0000
+++ b/extra/soundsoftware/SoundSoftware.pm	Fri Jun 14 10:25:26 2013 +0100
@@ -550,7 +550,9 @@
         $name = $repo;
     }
 
-    my $realm = '"Mercurial repository for ' . "'$name'" . '"';
+#    my $realm = '"Mercurial repository for ' . "'$name'" . '"';
+# see #577:
+    my $realm = '"Mercurial repository for ' . "$name" . '"';
 
     $realm;
 }