From 5735cb742a45a503e8eb7e409067f7c3d4cb9158 Mon Sep 17 00:00:00 2001
From: Matthew Stamy <Matthew Stamy>
Date: Wed, 18 May 2016 11:47:24 -0500
Subject: [PATCH] Version 1.26.0 update

---
 CHANGELOG          | 29 ++++++++++++++++++++++++++++-
 PyPDF2/_version.py |  2 +-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index fb89b6dc6..fc245b4b1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,31 @@
-Patch 1.25.1, 2015-07-20
+Version 1.26.0, 2016-05-18
+--------------------------
+
+ - NOTE: Active maintenance on PyPDF2 is resuming after a hiatus
+
+ - Fixed a bug where image resources where incorrectly
+   overwritten when merging pages
+
+ - Added dictionary for JavaScript actions to the root (louib)
+
+ - Added unit tests for the JS functionality (louib)
+
+ - Add more Python 3 compatibility when reading inline images (im2703
+   and (VyacheslavHashov)
+
+ - Return NullObject instead of raising error when failing to resolve
+   object (ctate)
+
+ - Don't output warning for non-zeroed xref table when strict=False
+   (BenRussert)
+
+ - Remove extraneous zeroes from output formatting (speedplane)
+
+ - Fix bug where reading an inline image would cut off prematurely
+   in certain cases (speedplane)
+
+
+Patch 1.25.1, 2015-07-20
 
  - Fix bug when parsing inline images. Occurred when merging
    certain pages with inline images
diff --git a/PyPDF2/_version.py b/PyPDF2/_version.py
index 760870ccf..5fc7041e2 100644
--- a/PyPDF2/_version.py
+++ b/PyPDF2/_version.py
@@ -1 +1 @@
-__version__ = '1.25.1'
+__version__ = '1.26.0'