From 219d9a7297efc5673a8c77400204130d66bca311 Mon Sep 17 00:00:00 2001
From: Cory Benfield <lukasaoz@gmail.com>
Date: Wed, 18 Jan 2017 12:22:14 +0000
Subject: [PATCH] Prepare changelog for 2.12.5

---
 HISTORY.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/HISTORY.rst b/HISTORY.rst
index e377c405..8bad7eb0 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,14 @@
 Release History
 ---------------
 
+2.12.5 (2017-01-18)
++++++++++++++++++++
+
+**Bugfixes**
+
+- Fixed an issue with JSON encoding detection, specifically detecting
+  big-endian UTF-32 with BOM.
+
 2.12.4 (2016-12-14)
 +++++++++++++++++++