From 31001963d2a64c250dae6f2e400653d3efc0a8e8 Mon Sep 17 00:00:00 2001
From: Deven Bansod <devenbansod.bits@gmail.com>
Date: Thu, 26 Nov 2015 19:20:04 +0530
Subject: [PATCH] Changelog entry for #11684

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

diff --git a/ChangeLog b/ChangeLog
index 9dae02c1d3..8315631e02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog
 - issue        Incorrect script name in include
 - issue #11685 Warning: Invalid argument supplied for foreach()
 - issue #11687 Delimiter missing while exporting multiple db routines
+- issue #11684 mysql_native_password with MariaDB bug
 
 4.5.2.0 (2015-11-23)
 - issue #11589 Incorrect parameter in mysqli_fetch_fields()