From 7a12a42be59ce82063d76d5fa500495e09665366 Mon Sep 17 00:00:00 2001
From: Bozhidar Batsov <bozhidar@batsov.com>
Date: Fri, 22 Nov 2013 12:50:37 +0200
Subject: [PATCH] Add missing ChangeLog entry

---
 lisp/ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 51cd2e898d..ddb0a4e2b5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -53,6 +53,12 @@
 	* emacs-lisp/package.el (describe-package-1): Add package archive
 	to shown fields.
 
+2013-11-20  Bozhidar Batsov <bozhidar@batsov.com>
+
+	* progmodes/ruby-mode.el (ruby-custom-encoding-magic-comment-template):
+	Change default to "# encoding: %s" to differentiate it from the
+	default Ruby encoding comment template.
+
 2013-11-20  era eriksson  <era+emacsbugs@iki.fi>
 
 	* ses.el (ses-mode): Doc fix.  (Bug#14748)
-- 
2.20.1