Merge remote-tracking branch 'origin/no-gnus'
authorLars Ingebrigtsen <larsi@gnus.org>
Sun, 12 Feb 2012 20:54:42 +0000 (21:54 +0100)
committerLars Ingebrigtsen <larsi@gnus.org>
Sun, 12 Feb 2012 20:54:42 +0000 (21:54 +0100)
1  2 
lisp/ChangeLog

diff --cc lisp/ChangeLog
Simple merge