From 5dd754112d07ab7480824c2916689ce06f83a842 Mon Sep 17 00:00:00 2001
From: Synchro <marcus@synchromedia.co.uk>
Date: Wed, 2 Sep 2015 12:40:37 +0200
Subject: [PATCH] 5.2.12 release

---
 README.md           | 6 +-----
 VERSION             | 2 +-
 changelog.md        | 4 ++++
 class.phpmailer.php | 2 +-
 class.pop3.php      | 2 +-
 class.smtp.php      | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 4307fd342..4bfefa180 100644
--- a/README.md
+++ b/README.md
@@ -50,11 +50,7 @@ or
 composer require phpmailer/phpmailer
 ```
 
-or use the command below:
-
-```sh
-composer require phpmailer/phpmailer
-```
+If you want to use the Gmail XOAUTH2 authentication class, you will also need to add a dependency on the `league/oauth2-client` package.
 
 Alternatively, copy the contents of the PHPMailer folder into somewhere that's in your PHP `include_path` setting. If you don't speak git or just want a tarball, click the 'zip' button at the top of the page in GitHub.
 
diff --git a/VERSION b/VERSION
index 7ef7e8d8c..1567ea7db 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.2.11
\ No newline at end of file
+5.2.12
\ No newline at end of file
diff --git a/changelog.md b/changelog.md
index 90c3a96bf..63801eded 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 # ChangeLog
 
+## Version 5.2.12 (Sep 1st 2015)
+* Fix incorrect composer package dependencies
+* Skip existing embedded image `cid`s in `msgHTML`
+
 ## Version 5.2.11 (Aug 31st 2015)
 * Don't switch to quoted-printable for long lines if already using base64
 * Fixed Travis-CI config when run on PHP 7
diff --git a/class.phpmailer.php b/class.phpmailer.php
index a209e2f70..9b11eca36 100644
--- a/class.phpmailer.php
+++ b/class.phpmailer.php
@@ -31,7 +31,7 @@ class PHPMailer
      * The PHPMailer Version number.
      * @type string
      */
-    public $Version = '5.2.11';
+    public $Version = '5.2.12';
 
     /**
      * Email priority.
diff --git a/class.pop3.php b/class.pop3.php
index d6d9b3745..572ef2c0e 100644
--- a/class.pop3.php
+++ b/class.pop3.php
@@ -34,7 +34,7 @@ class POP3
      * @type string
      * @access public
      */
-    public $Version = '5.2.11';
+    public $Version = '5.2.12';
 
     /**
      * Default POP3 port number.
diff --git a/class.smtp.php b/class.smtp.php
index 055dc1ff0..b5876d08f 100644
--- a/class.smtp.php
+++ b/class.smtp.php
@@ -30,7 +30,7 @@ class SMTP
      * The PHPMailer SMTP version number.
      * @type string
      */
-    const VERSION = '5.2.11';
+    const VERSION = '5.2.12';
 
     /**
      * SMTP line break constant.
@@ -81,7 +81,7 @@ class SMTP
      * @deprecated Use the `VERSION` constant instead
      * @see SMTP::VERSION
      */
-    public $Version = '5.2.11';
+    public $Version = '5.2.12';
 
     /**
      * SMTP server port number.