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

[Guillaume Desmottes <gdesmott src gnome org>]

commit 1e71da786fcbc2ff9f4aa026b2b1fa05a752b499
Merge: bd75afa 4ef07b0
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Dec 19 09:35:25 2013 +0100

    Merge remote-tracking branch 'origin/gnome-3-10'
    
    Conflicts:
        NEWS
        configure.ac
        po/es.po
        po/ta.po
        po/te.po
        po/zh_CN.po

 po/de.po |  792 +++++++++++++++++++++++++++++++-----------------------------
 po/pa.po |  819 ++++++++++++++++++++++++++++++++------------------------------
 2 files changed, 836 insertions(+), 775 deletions(-)
---