From 9bfe14f7781f6f7567cfbf109474254cf6272518 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 08 Aug 2012 02:58:32 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail

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

diff --git a/CHANGELOG b/CHANGELOG
index 4ff82a4..464bc40 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -187,7 +187,7 @@
 - Fix handling contact photo url with https:// prefix (#1488202)
 - Fix possible infinite redirect on attachment preview (#1488199)
 - Improved clickjacking protection for browsers which don't support X-Frame-Options headers
-- Fixed bug where similiar folder names were highlighted wrong (#1487860)
+- Fixed bug where similar folder names were highlighted wrong (#1487860)
 - Fixed bug in handling link with '!' character in it (#1488195)
 - Fixed bug where session ID's length was limited to 40 characters (#1488196)
 - TinyMCE security issue: removed moxieplayer (embedding flv and mp4 is not supported anymore)

--
Gitblit v1.9.1