From 30529a02793354453971e874be0e78d554d770d9 Mon Sep 17 00:00:00 2001
From: wiredfool <eric-github@soroos.net>
Date: Tue, 12 Aug 2014 11:48:14 -0700
Subject: [PATCH] Bump Versions/Changelog

---
 CHANGES.rst     | 6 ++++++
 PIL/__init__.py | 2 +-
 _imaging.c      | 2 +-
 setup.py        | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 6ba32ec9f..36390e90d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,12 @@
 Changelog (Pillow)
 ==================
 
+2.3.2 (2014-08-13)
+------------------
+
+- Fixed CVE-2014-3589, a DOS in the IcnsImagePlugin
+  [Andrew Drake]
+
 2.3.1 (2014-03-14)
 ------------------
 - Fix insecure use of tempfile.mktemp (CVE-2014-1932 CVE-2014-1933)
diff --git a/PIL/__init__.py b/PIL/__init__.py
index 74e1aecb3..b866e02ec 100644
--- a/PIL/__init__.py
+++ b/PIL/__init__.py
@@ -12,7 +12,7 @@
 # ;-)
 
 VERSION = '1.1.7'  # PIL version
-PILLOW_VERSION = '2.3.1' # Pillow
+PILLOW_VERSION = '2.3.2' # Pillow
 
 _plugins = ['ArgImagePlugin',
             'BmpImagePlugin',
diff --git a/_imaging.c b/_imaging.c
index aca67d71e..a2806f7ff 100644
--- a/_imaging.c
+++ b/_imaging.c
@@ -71,7 +71,7 @@
  * See the README file for information on usage and redistribution.
  */
 
-#define PILLOW_VERSION "2.3.1"
+#define PILLOW_VERSION "2.3.2"
 
 #include "Python.h"
 
diff --git a/setup.py b/setup.py
index 558467923..bc1e34ffe 100644
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ except ImportError:
 
 
 NAME = 'Pillow'
-VERSION = '2.3.1'
+VERSION = '2.3.2'
 TCL_ROOT = None
 JPEG_ROOT = None
 ZLIB_ROOT = None