From 505f6e5b428222f97f80c1d9d325d9ca34c14361 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 9 Jun 2012 15:44:56 +0200
Subject: Update to Mail_Mime-1.8.5 (#1488521)

Conflicts:

	CHANGELOG
	program/lib/Mail/mime.php
	program/lib/Mail/mimePart.php
---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

(limited to 'CHANGELOG')

diff --git a/CHANGELOG b/CHANGELOG
index 7ecbc997d..adf202762 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Update to Mail_Mime-1.8.5 (#1488521)
 - Fix XSS vulnerability in message subject handling using Larry skin (#1488519)
 - Fix handling of links with various URI schemes e.g. "skype:" (#1488106)
 - Fix handling of links inside PRE elements on html to text conversion
-- 
cgit v1.2.3