Merge branch 'gnome-3-8'

Conflicts:
	src/empathy.c

diff --cc libempathy/empathy-utils.c
index 55769ca40a9d7210f7413c585eadb524b2fd2258,b8f54baa42177e626b7c91577a1de37ff3de19b6..0efe3a1807ebd959cbea8353fa7e38402a098ad7
--- 1/libempathy/empathy-utils.c
--- 2/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@@ -27,16 -27,20 +27,18 @@@
   */
  
  #include "config.h"
 +#include "empathy-utils.h"
  
  #include <glib/gi18n-lib.h>
 -
 -#include <libxml/uri.h>
  #include <dbus/dbus-protocol.h>
 +#include <math.h>
  
  #include "empathy-client-factory.h"
 -#include "empathy-utils.h"
  #include "empathy-presence-manager.h"
 -
 -#include <extensions/extensions.h>
 +#include "extensions.h"
  
+ #include <math.h>
+ 
  #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
  #include "empathy-debug.h"