From d7181d1b5a35bf91053d74babf1a3cef666d894e Mon Sep 17 00:00:00 2001
From: Deven Bansod <devenbansod.bits@gmail.com>
Date: Fri, 26 Aug 2016 00:04:19 +0530
Subject: [PATCH] ChangeLog entries for #12476 and #12477

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 7dc6cf9114..413e3f6b6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@ phpMyAdmin - ChangeLog
 - issue #12251 Fixed random logouts due to wrong cookie path
 - issue #12480 Fixed editing of ENUM/SET/DECIMAL fields structure
 - issue #12497 Missing escaping of configuration used in SQL (hide_db and only_db)
+- issue #12476 Add error checking in reading advisory rules file
+- issue #12477 Add checking missing elements and confirming element types from json_decode
 
 4.6.4 (2016-08-16)
 - issue        [security] Weaknesses with cookie encryption, see PMASA-2016-29