usa	2016-08-16 13:39:33 +0900 (Tue, 16 Aug 2016)

  New Revision: 55922

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55922

  Log:
    merge revision(s) 55726,55727: [Backport #12609]
    
    * lib/rexml/attribute.rb (REXML::Attribute#to_string): Fix wrong
      entry reference name of double quote.
      [Bug#12609][ruby-core:76509]
      Patch by Joseph Marrero. Thanks!!!
      [Bug #12609][ruby-core:76509]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/lib/rexml/attribute.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 55921)
+++ ruby_2_2/ChangeLog	(revision 55922)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Aug 16 13:38:36 2016  Kouhei Sutou  <kou@c...>
+
+	* lib/rexml/attribute.rb (REXML::Attribute#to_string): Fix wrong
+	  entry reference name of double quote.
+	  [Bug #12609][ruby-core:76509]
+	  Patch by Joseph Marrero. Thanks!!!
+
 Tue Aug 16 13:36:00 2016  Koichi Sasada  <ko1@a...>
 
 	* gc.c (gc_mark_roots): should mark the VM object itself to mark
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 55921)
+++ ruby_2_2/version.h	(revision 55922)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.6"
 #define RUBY_RELEASE_DATE "2016-08-16"
-#define RUBY_PATCHLEVEL 350
+#define RUBY_PATCHLEVEL 351
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 8
Index: ruby_2_2/lib/rexml/attribute.rb
===================================================================
--- ruby_2_2/lib/rexml/attribute.rb	(revision 55921)
+++ ruby_2_2/lib/rexml/attribute.rb	(revision 55922)
@@ -109,7 +109,7 @@ module REXML https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/rexml/attribute.rb#L109
     #  b.to_string     # -> "ns:x='y'"
     def to_string
       if @element and @element.context and @element.context[:attribute_quote] == :quote
-        %Q^#@expanded_name="#{to_s().gsub(/"/, '&quote;')}"^
+        %Q^#@expanded_name="#{to_s().gsub(/"/, '&quot;')}"^
       else
         "#@expanded_name='#{to_s().gsub(/'/, '&apos;')}'"
       end

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r55726-55727


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/