commit f97b8a29540f34a9cc8378634f9b4670d44c2124
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jan 20 15:54:50 2014 +0100

    3.11.4

 NEWS         | 24 ++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 26 insertions(+), 2 deletions(-)

commit 996f54e4a847489c625c6a813c76f0d5644ae042
Author: Wylmer Wang <wantinghard@gmail.com>
Date:   Sun Jan 19 09:50:17 2014 +0800

    Revert "Update Chinese simplified translation"

    This reverts commit f43358a4cf5228790dd4b1a03aae74730228e417.

 po/zh_CN.po | 7145
 ++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 4351 insertions(+), 2794 deletions(-)

commit a7d85669976bf2343ea3c420263582c048fc562a
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Sat Jan 18 14:13:25 2014 +0100

    Add a trailing semicolon to keywords in Turkish translation

 po/tr.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4a9807910648d75977162928cbf25e577358d8d6
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Sat Jan 18 14:12:33 2014 +0100

    Add a trailing semicolon to keywords in Slovak translation

 po/sk.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f43358a4cf5228790dd4b1a03aae74730228e417
Author: Tong Hui <tonghuix@gmmail.com>
Date:   Sat Jan 18 11:29:52 2014 +0800

    Update Chinese simplified translation

 po/zh_CN.po | 7169
 +++++++++++++++++++++++------------------------------------
 1 file changed, 2806 insertions(+), 4363 deletions(-)

commit 7413907f46ef2f742d61cc3752b57d4a85208424
Author: Wylmer Wang <wantinghard@gmail.com>
Date:   Sat Jan 18 10:28:59 2014 +0800

    Fix a mistake in Chinese simplified translation that may block
    compiling

 po/zh_CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 649c99c125a3134584cff3160c08c2e4c4f81e2b
Author: Marek Černocký <marek@manet.cz>
Date:   Fri Jan 17 14:28:58 2014 +0100

    Updated Czech translation

 po/cs.po | 356
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 174 insertions(+), 182 deletions(-)

commit 14720d3a27d7810af608f8bbb9c7fea6f7d28a8d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jan 13 10:15:25 2014 +0100

    telepathy-account-widgets: update to master

    Needed to fix bgo#710252.

 telepathy-account-widgets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a9ffa65a771b4cc3feca06366cc1568e5d616382
Author: Dimitris Spingos <dmtrs32@gmail.com>
Date:   Sun Jan 12 20:10:53 2014 +0200

    Updated Greek translation

 po/el.po | 410
 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 206 insertions(+), 204 deletions(-)

commit b41c72fd744c3a2d2e66a6a075ee96346a6fbc55
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Jan 7 11:18:20 2014 +0100

    remove EGGLISTBOX_CFLAGS

    We stopped using egg-list-box a while ago.

 libempathy-gtk/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

commit df6bd22f9a320dad25eaffa5c061921de7ee351b
Merge: 5739650 4a0d05f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Jan 7 10:38:32 2014 +0100

    Merge branch 'gnome-3-10'

    Conflicts:
	NEWS
	configure.ac
	help/el/el.po

commit 4a0d05f76bb33b1a78c96333780d38b23cc74b16
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 7 10:37:51 2014 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8b2b650001042efed6b84281ddedad0e0c2eb6f2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Jan 7 10:32:16 2014 +0100

    3.10.3

 NEWS	      | 17 +++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

commit 57396500ea506ca42677292b6ab8e0cf664e5f7f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 6 15:23:16 2014 +0100

    run coding style checks on tests

    https://bugzilla.gnome.org/show_bug.cgi?id=721484

 tests/Makefile.am	       | 12 ++++++++++++
 tests/interactive/Makefile.am | 14 ++++++++++++++
 2 files changed, 26 insertions(+)

commit 1bb72627c34c990adb807a633464ee9ca276290e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 6 15:27:45 2014 +0100

    mock-pkcs11: use g_hash_table_unref()

    Same effect here but g_hash_table_destroy() is banned from our
    "coding style"
    check tools.

    https://bugzilla.gnome.org/show_bug.cgi?id=721484

 tests/mock-pkcs11.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 7c3dfe14b806582b204ec447354e28ff689e061e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 6 15:27:20 2014 +0100

    Update FSF postal address

    https://bugzilla.gnome.org/show_bug.cgi?id=721484

 tests/interactive/test-empathy-calendar-button.c	  | 7 +++----
 tests/interactive/test-empathy-contact-blocking-dialog.c | 7 +++----
 tests/interactive/test-empathy-presence-chooser.c	  | 7 +++----
 tests/interactive/test-empathy-status-preset-dialog.c	  | 7 +++----
 tests/mock-pkcs11.c					  | 3 +--
 tests/mock-pkcs11.h					  | 3 +--
 6 files changed, 14 insertions(+), 20 deletions(-)

commit 5e8fcdce36151ee61fbbe3937b2a8d1e58850b6e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 6 15:27:03 2014 +0100

    coding style fixes

    https://bugzilla.gnome.org/show_bug.cgi?id=721484

 tests/empathy-tls-test.c | 7 ++++---
 tests/mock-pkcs11.c	  | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

commit 747da9fea882b5e4962e2d1f3e4f86074a350633
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Jan 6 15:17:34 2014 +0100

    telepathy-account-widgets: update to master

 telepathy-account-widgets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c204482d591d7e6e38b5bded637eff6f69e05ca0
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Mon Jan 6 09:30:13 2014 +0100

    [l10n] Updated Italian translation.

 po/it.po | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 16bade3274574551b98d07252276d1de6585bdbc
Author: Andika Triwidada <andika@gmail.com>
Date:	Sat Jan 4 12:58:09 2014 +0700

    Updated Indonesian translation

 po/id.po | 392
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 192 insertions(+), 200 deletions(-)

commit 51de235d7db35d6e4ae87f4196b7060fb40afe96
Author: Dimitris Spingos <dmtrs32@gmail.com>
Date:	Fri Jan 3 11:56:09 2014 +0200

    Updated Greek translation of help

 help/el/el.po | 993
 +++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 559 insertions(+), 434 deletions(-)

commit 23937af16dffe6a80d72b110fb28dbe21b0af0c9
Author: Rafael Ferreira <rafael.f.f1@gmail.com>
Date:	Thu Jan 2 05:34:24 2014 -0200

    Updated Brazilian Portuguese translation

 po/pt_BR.po | 407
 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 204 insertions(+), 203 deletions(-)

commit 94af51365ffd0895b2c808358b1e4361ddc3ad31
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Dec 30 11:50:40 2013 +0100

    Updated Spanish translation

 po/es.po | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit 801790847fde7c295676020ebc5c30f463caf7dc
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Mon Dec 30 01:08:24 2013 +0100

    Updated Galician translations

 po/gl.po		   | 9 ++++-----
 telepathy-account-widgets | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

commit 8ea105b6e4b6a42e758ab6514d754dca2ce3059c
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Thu Dec 19 01:51:48 2013 +0100

    Updated Galician translations

 po/gl.po | 366
 +++++++++++++++++++++++++++++----------------------------------
 1 file changed, 171 insertions(+), 195 deletions(-)

commit 4524002368150694c16581b4a8d3481808ded736
Author: Wylmer Wang <wantinghard@gmail.com>
Date:	Sat Dec 28 20:44:19 2013 +0800

    Update Chinese simplified translation

 po/zh_CN.po | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

commit e6b830dbe26a16407beba356eefdf85f79da9f2a
Author: Michael Catanzaro <mcatanzaro@gnome.org>
Date:	Mon Dec 9 11:43:02 2013 -0600

    app menu: standardize Help/About/Quit

    We're going to use simply "About" instead of "About Empathy"

    https://wiki.gnome.org/Design/HIG/ApplicationMenus

    https://bugzilla.gnome.org/show_bug.cgi?id=720114

 src/empathy-roster-window-menubar.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 41d6dccc6ecdb3cf13ffd43533e612c2b71b71d7
Merge: 4de10b5 ac8964d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 27 17:00:04 2013 +0100

    Merge branch 'gnome-3-10'

commit ac8964d55c1c8fa4b349a0b3c995d605b3ed33c9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 27 16:55:46 2013 +0100

    roster-view: check the 'expanded' property on the GtkExpander

    EmpathyRosterGroup is no longer a GtkExpander subclass but a
    GtkListBoxRow
    one.

    https://bugzilla.gnome.org/show_bug.cgi?id=712566

 libempathy-gtk/empathy-roster-view.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 4de10b5ccf45229e8557b808ae601073d23251c4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Dec 27 16:42:20 2013 +0100

    tp-account-widgets: update to master

 telepathy-account-widgets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7ff769c94a88f7ef6adce284accf6a4ab8a9b359
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	Mon Dec 23 20:05:31 2013 +0100

    Updated Slovenian translation

 po/sl.po | 231
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 115 insertions(+), 116 deletions(-)

commit 64781f19b47a4f9373c40fa824fec11bd9778f2b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Dec 19 12:25:54 2013 +0100

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)