[empathy: 10/10] Merge branch 'gnome-3-6'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 31ec75a03a132770268cf02d98f2b477747bb54f
Merge: 16973fd 1e7449f
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Jan 7 14:08:27 2013 +0100

    Merge branch 'gnome-3-6'
    
    Conflicts:
    	po/kn.po
    	po/ta.po

 libempathy-gtk/empathy-log-window.c |    9 +-
 po/hi.po                            |  174 +-
 po/te.po                            |  226 +--
 po/ug.po                            | 3889 ++++++++++++++++++-----------------
 4 files changed, 2165 insertions(+), 2133 deletions(-)
---