From 886326f10d2efa0b2e6cec55cf6434fb062d0971 Mon Sep 17 00:00:00 2001
From: c0re <c0re@psypanda.org>
Date: Mon, 9 Mar 2015 19:38:03 +0100
Subject: [PATCH] Increased version number

Updated to v3.1.4
---
 doc/CHANGELOG | 6 ++++++
 hashid.py     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 9345f78..c06588c 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,5 +1,11 @@
 ### Changelog
 
+v3.1.4
+- Fixed Python 2.7/3.3 incompatibility
+- Added MySQL Challenge-Response Authentication hash format
+- Added PrestaShop hash format
+- Fixed PDF 1.4 - 1.6 (Acrobat 5 - 8) regular expression
+
 v3.1.3
 - First release on PyPi
 - Added Dahua hash format
diff --git a/hashid.py b/hashid.py
index 5707a9f..b90f326 100755
--- a/hashid.py
+++ b/hashid.py
@@ -23,7 +23,7 @@
 from collections import namedtuple
 
 __author__  = "c0re"
-__version__ = "3.1.3"
+__version__ = "3.1.4"
 __github__  = "https://github.com/psypanda/hashID"
 __license__ = "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>"