From 5a870688b082ec958c99a757139dd2e26b1f8233 Mon Sep 17 00:00:00 2001
From: cmcnulty <cmcnulty@kznf.com>
Date: Mon, 04 Nov 2013 08:47:42 -0500
Subject: [PATCH] Merge remote-tracking branch 'upstream/master' into row-focus

---
 CHANGELOG |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8cb4685..0ae6254 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Improve identity selection based on From: header (#1489378)
+- Fix issue where mails with inline images of the same name contained only the first image multiple times (#1489406)
 - Use left/right arrow keys to collapse/expand thread and spacebar to select a row, change Ctrl key behavior (#1489392)
 - Fix an issue where using arrow keys to go up a list can result in selected message being under headers (#1489403)
 - Fix an issue where Home/End keys don't focus list row properly, don't scrollTo properly (#1489396)

--
Gitblit v1.9.1