From b2cda1d0c6d44f53f71bad9e256f41188677dfba Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Wed, 1 Oct 2008 20:56:04 +0000
Subject: Merge revisions 36016:36533 from trunk.

svn path=/branches/kill-bonobo/; revision=36534
---
 composer/ChangeLog | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'composer/ChangeLog')

diff --git a/composer/ChangeLog b/composer/ChangeLog
index 7afbe38079..0e5a3dd328 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,31 @@
+2008-10-01  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #554418
+
+	* e-msg-composer.c: (handle_uri),
+	(e_msg_composer_add_inline_image_from_file): Guess mime_type based
+	on the file content, if failed, then on the filename.
+
+2008-09-29  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-msg-composer.c:
+
+2008-09-25  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fix for bug #553148
+
+	* mail-composer.error.xml: Standardise "GroupWise" usage in
+	translatable strings.
+
+2008-09-23  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #553273
+
+	* e-composer-actions.c: (action_save_cb):
+	Always end e_error_run/e_error_new calls with NULL parameter.
+
 2008-09-10  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #551548
-- 
cgit