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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@55958 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 47c24328bd..54f529ed9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Aug 18 23:06:20 2016  Kouhei Sutou  <kou@cozmixng.org>
+
+	* 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!!!
+
 Thu Aug 18 23:04:59 2016  Naohisa Goto  <ngotogenome@gmail.com>
 
 	* thread.c (rb_wait_for_single_fd): Clean up fds.revents every time
diff --git a/lib/rexml/attribute.rb b/lib/rexml/attribute.rb
index e9917cf52d..ca5984e178 100644
--- a/lib/rexml/attribute.rb
+++ b/lib/rexml/attribute.rb
@@ -110,7 +110,7 @@ module REXML
     #  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
diff --git a/version.h b/version.h
index 66b6aa6a06..a8df1e6a22 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.3.2"
 #define RUBY_RELEASE_DATE "2016-08-18"
-#define RUBY_PATCHLEVEL 169
+#define RUBY_PATCHLEVEL 170
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 8