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

diff --cc lisp/ChangeLog
index cc900f0,955fc17..ffc28ac
--- 1/lisp/ChangeLog
--- 2/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.