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

[Guillaume Desmottes <gdesmott src gnome org>]

commit 22c51f171e1644e0a9f64a0d3c4ee027aa9a1eb6
Merge: 356ab07 8272468
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Nov 22 09:37:57 2012 +0100

    Merge branch 'gnome-3-6'
    
    Conflicts:
    	configure.ac
    	po/da.po
    	po/et.po
    	po/kn.po
    	po/mr.po
    	po/nb.po
    	po/sk.po

 NEWS        |   39 +++
 po/gu.po    |   23 +-
 po/or.po    |  908 ++++++++++++++++++++++++++++-------------------------------
 po/pa.po    |  175 ++++++------
 po/pt_BR.po |  174 ++++++------
 5 files changed, 666 insertions(+), 653 deletions(-)
---