From 25a55c6c668de61cc3b97aab4237ebf6dadabe17 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 14 Oct 2015 10:58:12 +0200
Subject: [PATCH] Bump to version 1.2.5

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a185047..f287447 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v1.2.5 (2015-10-14)
+
+- handle the third argument of mb_convert_encoding() being an array
+- add license files
+
 ## v1.2.4 (2015-06-29)
 
 - trigger silenced deprecation notices when shims are in use