[empathy: 32/32] Merge remote-tracking branch 'origin/gnome-3-10'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 81c169d8dcc6b3b3c2c9a2253da23c5e657ddf3a
Merge: 459911d fabe2b1
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Oct 31 13:21:23 2013 +0100

    Merge remote-tracking branch 'origin/gnome-3-10'
    
    Conflicts:
        po/cs.po
        po/es.po
        po/nb.po

 po/be.po       |  755 ++++++++--------
 po/el.po       | 2894 ++++++++++++++++++++++++++------------------------------
 po/gl.po       |  901 +++++++++---------
 po/lt.po       |  807 ++++++++--------
 po/sr.po       |  823 +++++++++--------
 po/sr latin po |  823 +++++++++--------
 6 files changed, 3434 insertions(+), 3569 deletions(-)
---