Merge in 5.2.1 from google code

WarHead · Apr 27, 2012 · 06aff1b · 06aff1b
1 parent 366cbc8
commit 06aff1b
Show file tree

Hide file tree

Showing 14 changed files with 213 additions and 611 deletions.
diff --git a/README b/README
@@ -1,14 +1,21 @@
 /*******************************************************************
-* The http://phpmailer.codeworxtech.com/ website now carries a few *
-* advertisements through the Google Adsense network. Please visit  *
-* the advertiser sites and help us offset some of our costs.       *
-* Thanks ....                                                      *
+*     http://code.google.com/a/apache-extras.org/p/phpmailer/      *
 ********************************************************************/
 
 PHPMailer
 Full Featured Email Transfer Class for PHP
 ==========================================
 
+Version 5.2.1 (January 16, 2012)
+
+Patch release (see changelog.txt).
+
+Version 5.2.0 (July 19, 2011)
+
+With the release of this version, PHPMailer has moved to Apache
+Extras:
+   http://code.google.com/a/apache-extras.org/p/phpmailer/
+
 Version 5.0.0 (April 02, 2009)
 
 With the release of this version, we are initiating a new version numbering

diff --git a/aboutus.html b/aboutus.html
diff --git a/changelog.txt b/changelog.txt
@@ -3,6 +3,12 @@ ChangeLog
 NOTE: THIS VERSION OF PHPMAILER IS DESIGNED FOR PHP5/PHP6.
       IT WILL NOT WORK WITH PHP4.
 
+Version 5.2.1 (January 16, 2012)
+* Closed several bugs
+* Performance improvements
+* MsgHTML() now returns the message as required.
+* New method: GetSentMIMEMessage() (returns full copy of sent message)
+
 Version 5.2 (July 19, 2011)
 * protected MIME body and header
 * better DKIM DNS Resource Record support