From 6a3509e622cca992fc72a7531d7dfed775db60e5 Mon Sep 17 00:00:00 2001
From: fidian <fidian@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Fri, 27 Jul 2001 22:07:28 +0000
Subject: [PATCH] Brought CVS up to date with 1.2.0 rc1

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1460 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 AUTHORS               | 6 +++---
 ChangeLog             | 5 ++++-
 functions/strings.php | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 6ee1fcb4..215e1fd4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,6 @@
  Developers:
  -----------
+   Peter Hutnick <peter@hutnick.com>
    Luke Ehresman <luke@squirrelmail.org>     http://www.css.tayloru.edu/~lehresma
    Nathan Ehresman <nathan@squirrelmail.org> http://www.css.tayloru.edu/~nehresma
    Gustav Foseid <gustavf@squirrelmail.org>  http://www.initio.no
@@ -43,7 +44,6 @@
    i18n support:        Sergiusz Pawlowicz 
    SquirrelMail logo:   Libor Kopecky <libor@globe.cz>
    Web Site Admin/PR:   Paul Joseph Thompson <thomppj@okstate.edu>
-   FAQ Maintenance:     Peter Hutnick <peter@hutnick.com>
 
    Code contributions:  Konstantin Riabitsev <graf@relhum.org>
                         Alex Bleeker <beheer@hackers.nl>
@@ -53,8 +53,8 @@
                         Damien Sandras <dsandras@acm.org>
                         Martin Jespersen <mbj@mbj.dk>
                         David Whittington <dwhittin@css.tayloru.edu>
-                        Many others...
+                        Many, many others...
 
 (We have tried to keep this up to date to give credit where it is due.
 If you feel that you have wrongfully been left off this list, contact
-luke@squirrelmail.org)
+peter@squirrelmail.org)
diff --git a/ChangeLog b/ChangeLog
index c8b00e29..6b285a5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Version 1.1.3 -- DEVELOPMENT
+Version 1.2.0 -- DEVELOPMENT
+----------------------------
+
+Version 1.1.3 -- (never really released)
 ----------------------------
 - Added major speed improvements to IMAP functions by our friends at XS4ALL
 - Fixed MOTD
diff --git a/functions/strings.php b/functions/strings.php
index f3b190fc..c9a24e6a 100644
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -222,7 +222,7 @@
 
    /* SquirrelMail version number -- DO NOT CHANGE */
    global $version;
-   $version = '1.1.3 [cvs]';
+   $version = '1.2.0 [rc1]';
 
 
    function find_mailbox_name ($mailbox) {
-- 
2.25.1