From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sun, 23 Dec 2012 18:46:03 +0000 (+0100)
Subject: Merge branch 'master' of https://git.gnus.org/gnus
X-Git-Url: https://cgit.sxemacs.org/?a=commitdiff_plain;h=b81275df268c28a57b94f58417cfce61d36baf4c;p=gnus

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

b81275df268c28a57b94f58417cfce61d36baf4c
diff --cc lisp/ChangeLog
index cc900f0e2,955fc17e7..ffc28acbc
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,12 -1,15 +1,18 @@@
++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.
+ 
  2012-12-23  Lars Ingebrigtsen  <larsi@gnus.org>
  
  	* gnus-int.el (gnus-backend-trace): Factor out into its own function
  	for reuse.
  	(gnus-open-server): Use it to add more tracing.
  	(gnus-finish-retrieve-group-infos): Add backend tracing.
 +	(gnus-backend-trace): Also note the elapsed seconds.
  
- 2012-12-22  Philipp Haselwarter <philipp@haselwarter.org>
+ 2012-12-22  Philipp Haselwarter  <philipp@haselwarter.org>
  
  	* gnus-sync.el (gnus-sync-file-encrypt-to, gnus-sync-save): Set
  	epa-file-encrypt-to from variable to avoid querying.