[Erc-commit] [commit][master] Sync from Emacs

[mwolson]

commit 67c4c2fccc09ee114e706aaca99d763f3c0150fb
Author: Michael W. Olson <address@hidden>
Date:   Sat Jan 26 16:24:43 2008 -0500

    Sync from Emacs

diff --git a/ChangeLog b/ChangeLog
index cddd0f8..3fb174c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -288,3 +288,5 @@ See ChangeLog.07 for earlier changes.
 ;; coding: utf-8
 ;; add-log-time-zone-rule: t
 ;; End:
+
+;; arch-tag: 15787dfd-e091-4c8c-8b88-747b474e1ac7
diff --git a/erc-list.el b/erc-list.el
index fc8ec9b..586c720 100644
--- a/erc-list.el
+++ b/erc-list.el
@@ -225,3 +225,5 @@ to RFC and send the LIST header (#321) at start of list 
transmission."
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
+
+;; arch-tag: 99c5f9cb-6bac-4224-86bf-e394768cd1d0