From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 9 Sep 2013 14:24:21 +0000 (+0200)
Subject: Merge branch 'gnome-3-8'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=d121d6a9b9d4d3a654dfd2b0e900be216f161dba;hp=9129f3e31d22e7b375f3c90fd2e89e05f5e564eb

Merge branch 'gnome-3-8'

Conflicts:
	NEWS
	configure.ac
---

diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index 9c9c5c3a..e4f5e21d 100644
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -376,7 +376,7 @@ debug_window_get_messages_cb (GObject *object,
   messages = tp_debug_client_get_messages_finish (debug, result, &error);
   if (messages == NULL)
     {
-      DEBUG ("Failed to get debug messsages: %s", error->message);
+      DEBUG ("Failed to get debug messages: %s", error->message);
       g_error_free (error);
 
       /* We want to set the window sensitivity to false only when proxy for the