From 7bc630bf25c118a41dfa5fef978eda1e3ab4ee39 Mon Sep 17 00:00:00 2001
From: Deven Bansod <devenbansod.bits@gmail.com>
Date: Thu, 13 Oct 2016 10:18:53 +0530
Subject: [PATCH] ChangeLog entry for #12625

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

diff --git a/ChangeLog b/ChangeLog
index 2e2cd2917d..1ef8a5ef83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,6 +60,7 @@ phpMyAdmin - ChangeLog
 - issue #12569 Avoid showing import errors twice
 - issue #12362 prefs_manage.php can leave an orphaned temporary file
 - issue #12619 Unable to export csv when using union select
+- issue #12625 Broken Edit links in query results of JOIN query
 
 4.6.4 (2016-08-16)
 - issue        [security] Weaknesses with cookie encryption, see PMASA-2016-29