Merge branch 'master' of https://git.gnus.org/gnus
authorLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Wed, 29 Sep 2010 19:34:21 +0000 (21:34 +0200)
committerLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Wed, 29 Sep 2010 19:34:21 +0000 (21:34 +0200)
1  2 
lisp/ChangeLog

diff --cc lisp/ChangeLog
@@@ -1,10 -1,7 +1,12 @@@
 +2010-09-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 +
 +      * nnimap.el (nnimap-insert-partial-structure): Get the type from the
 +      correct slot, too.
 +
  2010-09-29  Julien Danjou  <julien@danjou.info>
  
+       * gnus.el (gnus-local-domain): Declare variable obsolete.
        * gnus-util.el (gnus-icompleting-read): Require iswitchb. Fix history
        computing.
        (gnus-ido-completing-read): Require ido.