commit ae51279486457b96bb746799fbb79b3e4b8518e6
Author: Emilio Pozuelo Monfort <[email protected]>
Date:   Tue Feb 1 14:51:06 2011 +0000

   Fix distcheck

extensions/Makefile.am |    3 +++
1 files changed, 3 insertions(+), 0 deletions(-)

commit 2c101f2718ae343a833e6f1885e11f45db8bc010
Merge: 1081451 c9dae1a
Author: Guillaume Desmottes <[email protected]>
Date:   Tue Feb 1 15:31:19 2011 +0100

   Merge branch 'release'

commit 108145120d9c320c81ee276770b2c63abd53ac99
Author: Daniel Nylander <[email protected]>
Date:   Tue Feb 1 15:27:02 2011 +0100

   Updated Swedish translation

po/sv.po |  593
++++++++++++++++++++++++++++++++------------------------------
1 files changed, 306 insertions(+), 287 deletions(-)

commit c9dae1a810f67c37e1218fc42b7364e0e2f91fc2
Author: Guillaume Desmottes <[email protected]>
Date:   Tue Feb 1 15:24:06 2011 +0100

   prepare 2.91.6.1

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

commit 621bbbb8631f4b149d0478a3423687e4e973b04f
Author: Emilio Pozuelo Monfort <[email protected]>
Date:   Tue Feb 1 13:47:58 2011 +0000

   Update tools from telepathy-glib

extensions/Makefile.am               |   12 +-
tools/Makefile.am                    |   14 +-
tools/c-constants-gen.py             |   84 +++++---
tools/check-coding-style.mk          |    4 +-
tools/git-which-branch.sh            |   25 +++
tools/glib-client-gen.py             |  283 +++++++++++++++----------
tools/glib-errors-check-gen.py       |   58 +++++
tools/glib-errors-enum-body-gen.py   |   62 ------
tools/glib-errors-enum-header-gen.py |   75 -------
tools/glib-errors-str-gen.py         |   82 +++++++
tools/glib-ginterface-gen.py         |  293 +++++++++++++++++---------
tools/glib-gtypes-generator.py       |  214 ++++++++++++-------
tools/glib-interfaces-gen.py         |  138 +++++++++++--
tools/gobject-foo.py                 |   23 ++-
tools/identity.xsl                   |    7 -
tools/libglibcodegen.py              |    5 +-
tools/libtpcodegen.py                |   36 +---
tools/make-release-mail.py           |   76 +++++++
tools/manager-file.py                |  175 +++++++++++++++
tools/shave.mk                       |    1 +
tools/telepathy-glib.supp            |  390
++++++++++++++++++++++++++++++++++
tools/test-wrapper.sh                |   30 +++
tools/valgrind.mk                    |   13 ++
tools/with-session-bus.sh            |   10 +-
tools/xincludator.py                 |   39 ++++
25 files changed, 1623 insertions(+), 526 deletions(-)

commit 9503c4aa28b9a4215e3e325a31b500f2c78b712a
Author: Guillaume Desmottes <[email protected]>
Date:   Tue Feb 1 11:34:37 2011 +0100

   individual-widget: connect on the notify::client-types only once

   Reconnecting a signal while you are handling it isn't exactly a good
   idea as
   it will result in an infinite loop eating all your memory (#635105).

libempathy-gtk/empathy-individual-widget.c |   24
++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)

commit 21321727a45ac859405638ba034dc4212f1374b8
Author: Guillaume Desmottes <[email protected]>
Date:   Tue Feb 1 10:44:21 2011 +0100

   remove released flag

configure.ac |    2 +-
1 files changed, 1 insertions(+), 1 deletions(-)