From 9588dbd4aaf7eb8c9558444ba52610a5a12e1aba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 29 Jul 2016 10:50:20 +0200
Subject: [PATCH] Add changelog entry
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #12378
Fixes #12389

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 707506bc1f..d73a870d39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@ phpMyAdmin - ChangeLog
 - issue #5555  Better report query errors while generating SQL exports
 - issue #12307 Produce valid JSON on export
 - issue #12325 Setup script icons broken
+- issue #12378 Support IPv6 proxies
 
 4.6.4 (not yet released)
 - issue        Include X-Robots-Tag header in responses