1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ef0400bc6..6cada4724f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jun  2 16:51:35 2016  Koichi ITO  <koic.ito@gmail.com>
+
+	* misc/ruby-mode.el (ruby-here-doc-beg-re),
+	  (ruby-here-doc-beg-match, ruby-parse-partial): Support for
+	  `squiggly heredoc' syntax in ruby-mode.  [Fix GH-1372]
+
 Thu Jun  2 10:24:48 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
 	* string.c: Raise ArgumentError when invalid string is detected in