Merge branch 'master' of https://git.gnus.org/gnus

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 955fc17..ffc28ac 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,5 @@
+2012-12-23  Lars Ingebrigtsen  <larsi@gnus.org>
+
 2012-12-23  Andreas Schwab  <schwab@suse.de>
 
        * shr.el (shr-tag-em): Render em as italic, not bold.
@@ -8,6