[Erc-commit] [commit][emacs22] Caught up with erc--rel--5.2

[mwolson]

commit bf8fef736a3106ed7982f966ed37790781a2a305
Merge: 8275264... 94c4908...
Author: Michael Olson <address@hidden>
Date:   Fri Mar 2 05:15:58 2007 +0000

    Caught up with erc--rel--5.2
    
    All that was out-of-date was the version number in the manual.  Not bad.
    git-archimport-id: address@hidden/erc--main--0--patch-114

diff --cc ChangeLog
index ce56964,ce56964..a180af1
--- a/ChangeLog
+++ b/ChangeLog
@@@ -12,6 -12,6 +12,8 @@@
        (erc-button-add-keys): New function that adds the <backtab> key to
        erc-mode-map.
  
++      * erc.texi: Change version to 5.2 (pre-release).
++
  2007-02-15  Michael Olson  <address@hidden>
  
        * CREDITS: Update.