From 4081f9f6a504c9d3b83237fafdecf2be042976a8 Mon Sep 17 00:00:00 2001
From: wiredfool <eric-github@soroos.net>
Date: Tue, 12 Aug 2014 11:44:56 -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 c40866e41..524f4100d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,12 @@
 Changelog (Pillow)
 ==================
 
+2.5.2 (2014-08-13)
+------------------
+
+- Fixed CVE-2014-3589, a DOS in the IcnsImagePlugin
+  [Andrew Drake]
+
 2.5.1 (2014-07-10)
 ------------------
 
diff --git a/PIL/__init__.py b/PIL/__init__.py
index 50b13b158..ea785d373 100644
--- a/PIL/__init__.py
+++ b/PIL/__init__.py
@@ -12,7 +12,7 @@
 # ;-)
 
 VERSION = '1.1.7'  # PIL version
-PILLOW_VERSION = '2.5.1' # Pillow
+PILLOW_VERSION = '2.5.2' # Pillow
 
 _plugins = ['BmpImagePlugin',
             'BufrStubImagePlugin',
diff --git a/_imaging.c b/_imaging.c
index 7ac283e8a..eff632082 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.5.1"
+#define PILLOW_VERSION "2.5.2"
 
 #include "Python.h"
 
diff --git a/setup.py b/setup.py
index 40d50577f..f01ac1d9b 100644
--- a/setup.py
+++ b/setup.py
@@ -90,7 +90,7 @@ except (ImportError, OSError):
 
 
 NAME = 'Pillow'
-PILLOW_VERSION = '2.5.1'
+PILLOW_VERSION = '2.5.2'
 TCL_ROOT = None
 JPEG_ROOT = None
 JPEG2K_ROOT = None