1 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7d6436cfafc..c30c02dcef3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,14 @@
 2014-04-06  João Távora  <joaotavora@gmail.com>
 
+        * progmodes/python.el (python-electric-pair-string-delimiter): Fix
+        triple-quoting electricity.  (Bug#17192)
+
+2014-04-06  João Távora  <joaotavora@gmail.com>
+
         * elec-pair.el (electric-pair-post-self-insert-function): Don't
         skip whitespace when `electric-pair-text-pairs' and
         `electric-pair-pairs' were used. syntax to
-        electric-pair--skip-whitespace. (Bug#17183)
+        electric-pair--skip-whitespace.  (Bug#17183)
 
 2014-04-06  Eli Zaretskii  <eliz@gnu.org>