[empathy: 8/8] Merge branch 'gnome-3-8'

[Guillaume Desmottes <gdesmott src gnome org>]

commit c4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed
Merge: eb3b3c9 63ded64
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri May 3 14:19:23 2013 +0200

    Merge branch 'gnome-3-8'
    
    Conflicts:
        src/empathy.c

 NEWS                       |   18 ++++++++++++++++++
 configure.ac               |    2 +-
 libempathy/empathy-utils.c |    2 ++
 3 files changed, 21 insertions(+), 1 deletions(-)
---
diff --cc libempathy/empathy-utils.c
index 55769ca,b8f54ba..0efe3a1
--- a/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"