Merge branch 'gnome-3-8'

Conflicts:
	NEWS
	configure.ac

diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index 9c9c5c3ab5a958f7d5476375d50f00152bb9b042..e4f5e21d646b2f00b41abb7289445604267d299d 100644 (file)
--- 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