From 1ba8d5b9ce87eece8af2e94f41e9a30cd77a8012 Mon Sep 17 00:00:00 2001
From: Alex Clark <aclark@aclark.net>
Date: Wed, 13 Mar 2013 21:53:14 -0400
Subject: [PATCH] Add contributor and changelog entry

---
 docs/CONTRIBUTORS.rst | 5 +++--
 docs/HISTORY.txt      | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/CONTRIBUTORS.rst b/docs/CONTRIBUTORS.rst
index 6f6cbe440..4fe8f9d83 100644
--- a/docs/CONTRIBUTORS.rst
+++ b/docs/CONTRIBUTORS.rst
@@ -13,14 +13,17 @@ Contributors (Pillow)
 - Daniel Hahler <github __at__ thequod.de>, developer
 - David Schmidt <david.schmiddi.86 __at__ gmail.com>, developer
 - Eliot <saltycrane __at__ gmail.com>, developer
+- etienne <etienne.desautels __at__ gmail.com>, developer
 - Jannis Leidel <jannis __at__ leidel.info>, developer
 - Kyle MacFarlane <kyle __at__ deletethetrees.com>, developer
 - Lars Yencken <lars __at__ yencken.org>, developer
+- Liu Qishuai <lqs __at__ lqs.me>, developer
 - Manuel Ebert <Maebert __at__ UOS.de>, developer
 - Marc Abramowitz <marc __at__ marc-abramowitz.com>, developer
 - Matti Picus <gitmatti __at__ picus.org.il>, developer
 - Mikhail Korobov <kmike84 __at__ gmail.com>, developer
 - OCHIAI, Gouji <gjo.ext __at__ gmail.com>, developer
+- Oliver Tonnhofer <olt __at__ bogosoft.com>, developer
 - Phil Elson <pelson.pub __at__ gmail.com>, developer
 - Sandro Mani <manisandro __at__ gmail.com>, developer
 - Simon Law <simon.law __at__ ecometrica.com>, developer
@@ -29,7 +32,5 @@ Contributors (Pillow)
 - Tom Gross <tom __at__ toms-projekte.de>, developer
 - Tom Payne <twpayne __at__ gmail.com>, developer
 - Tyler Garner <garnertb __at__ gmail.com>, developer
-- etienne <etienne.desautels __at__ gmail.com>, developer
 - tdesvenain <thomas.desvenain __at__ gmail.com>, developer
-- Liu Qishuai <lqs __at__ lqs.me>, developer
 - wiredfool <eric-github __at__ soroos.net>, developer
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index 45c755a2f..43655c3d6 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -13,6 +13,9 @@ Changelog (Pillow)
 - Add experimental Tiff G3/G4 support.
   [wiredfool]
 
+- Backport PIL's PNG/Zip improvements: add new FASTOCTREE quantizer with alpha support, make ZIP compress level and type configurable, support reading/writing PNGs with paletted alpha.
+  [olt]
+
 - Many other bug fixes and enhancements by many other people (see docs/CONTRIBUTORS.txt).
 
 1.7.8 (2012-11-01)