commit 40113ff660a2f9e602d908d271421496adf271ff
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Sep 7 14:47:11 2012 +0200

    prepare 3.5.91.1

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

commit aedb262e0da4423805b3e2285019f6a9342d5135
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Sep 7 14:31:58 2012 +0200

    add a FIXME about the initial value of the 'remember' checkbox

 libempathy-gtk/empathy-account-widget.c | 3 +++
 1 file changed, 3 insertions(+)

commit 0c4079edb20dc99d17dc8e2b212f3fca7841357b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Sep 7 14:25:57 2012 +0200

    account-settings: always save the password into the password storage

    This ensures that the password is stored with the proper 'remember'
    value.

 libempathy/empathy-account-settings.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

commit 689c34ab5fec2ad965e934a532b6fca4008c06ef
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Sep 7 12:18:17 2012 +0200

    consider account widget has changed if the remember checkbox is
    changed

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

 libempathy-gtk/empathy-account-widget.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

commit 39505b161f8034a1377488492e063db08ce54f2d
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:   Fri Sep 7 12:57:37 2012 +0200

    EmpathyRosterWindow: refactor error infobar code

 data/empathy.css            |   8 ++
 src/empathy-roster-window.c | 299
 ++++++++++++++------------------------------
 2 files changed, 105 insertions(+), 202 deletions(-)

commit 744fa348bf3f157b95af77446ff2b4440554bf2e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Sep 7 11:07:57 2012 +0200

    accounts_dialog_update_settings: fix if no account is selected

    The logic changed if no account is selected as new account are now
    added using
    a separated dialog. So if no account is selected we can certainly
    add a new
    account but not remove anything.

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

 src/empathy-accounts-dialog.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit c786f765510f4796153f23b7c6cd549e1d6a2a6c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Sep 7 10:56:11 2012 +0200

    ll-xmpp-assistant: deal with the im-local-xmpp not being found

    For some reason my test user can't find it; best to not raise warnings
    in this
    case.

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

 libempathy-gtk/empathy-local-xmpp-assistant-widget.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit bda7803e256668ef173342429c4e55de8cae1456
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Sep 5 11:58:35 2012 +0200

    mcp-account-manager-uoa: reconnect accounts when they are not failing
    any more

    We want to automatically reconnect failing accounts when user
    refreshed the
    credentials.

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

 .../mc-plugin/mcp-account-manager-uoa.c            | 37
 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)

commit 714036edd7111165600338c9b1de72c247926764
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Sep 7 09:14:57 2012 +0200

    Depend on mission-control 5.13.1

    Needed for the new reconnect plugin API.

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

commit 2aca51f0e02313124ac3ddfe7c7ab3bb0060c3de
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Sep 5 11:33:21 2012 +0200

    webcredentials-monitor: track failures

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

 .../mc-plugin/empathy-webcredentials-monitor.c     | 143
 +++++++++++++++++++--
 .../mc-plugin/empathy-webcredentials-monitor.h     |   8 +-
 2 files changed, 142 insertions(+), 9 deletions(-)

commit 15813f2b1708d9ec01e593a2f19ca4e5592e8052
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Sep 5 10:47:41 2012 +0200

    webcredentials-monitor: get a proxy on the D-Bus object

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

 .../mc-plugin/empathy-webcredentials-monitor.c     | 44
 +++++++++++++++++++++-
 1 file changed, 42 insertions(+), 2 deletions(-)

commit be4231bfd2bd06d23a2ddf9c5910444eb2541f5d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Sep 5 09:44:45 2012 +0200

    add empathy-webcredentials-monitor

    Just the skeleton so far.

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

 ubuntu-online-accounts/mc-plugin/Makefile.am       |   1 +
 .../mc-plugin/empathy-webcredentials-monitor.c     | 116
 +++++++++++++++++++++
 .../mc-plugin/empathy-webcredentials-monitor.h     |  53 ++++++++++
 3 files changed, 170 insertions(+)

commit febd3c5c52a1bc275dea77d86b3bab20594ad4ec
Author: Milo Casagrande <milo@ubuntu.com>
Date:   Thu Sep 6 23:16:02 2012 +0200

    [l10n] Updated Italian translation.

 po/it.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 190353cd2cb2ba0566598e6bf6332f7294a13182
Author: Milo Casagrande <milo@ubuntu.com>
Date:   Thu Sep 6 22:17:38 2012 +0200

    [l10n] Updated Italian translation.

 po/it.po | 69
 +++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 38 insertions(+), 31 deletions(-)

commit 0797d2389eebf27970c8664243d5895ebf93667f
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Thu Sep 6 20:51:36 2012 +0200

    Updated Slovenian translation

 po/sl.po | 496
 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 238 insertions(+), 258 deletions(-)

commit 0762876afc5ad7eec23696179f28d9bafb196563
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Thu Sep 6 18:22:38 2012 +0200

    Updated Spanish translation

 po/es.po | 74
 +++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 41 insertions(+), 33 deletions(-)

commit 8af24addff899127fc433e0e4233cd568bd2ab1c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Sep 6 16:25:23 2012 +0200

    roster-window: display loading page when reconnecting accounts

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

 src/empathy-roster-window.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

commit f6a74bbbfd94d2bb6eef27e7e2b5f5cb45927371
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Sep 6 16:15:59 2012 +0200

    roster-window: inline hide/show_contacts_loading in
    set_notebook_page()

    It's cleaner to have all the logic deciding which page to display in
    set_notebook_page().

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

 src/empathy-roster-window.c | 40 +++++++++++++++-------------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

commit 80ccb990d65628a31694edc94dcc2cb1511f5d9d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Sep 6 15:48:33 2012 +0200

    roster-window: update the roster page when the most available
    presence changes

    Fix a race between all the contacts being removed, and so the roster
    being empty, and the presence notification.

 src/empathy-roster-window.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 96020e16337fe47fe35d88db9fb2503bc213b86e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Sep 6 15:41:47 2012 +0200

    actually display the 'go online' button

    I added this flag exactly for this and then forgot to use it...

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

commit 6be8487c6325e206fa9741d6c91a4c2420169e1b
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Wed Sep 5 20:14:41 2012 -0400

    Don't show "Topic: " in tooltips if there is none

    I think I made this regress when I made Empathy understand the new
    Subject interface.

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

 src/empathy-chat-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f81f33ec7dbecdb94f4d7a032ab852ecf9593cb2
Author: Fábio Nogueira <fnogueira@gnome.org>
Date:   Thu Sep 6 09:09:33 2012 -0400

    Updated Brazilian Portuguese translation.

 po/pt_BR.po | 3717
 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 1846 insertions(+), 1871 deletions(-)

commit a61ed79e43f7ad337f542861544dd553cbe07640
Author: Og B. Maciel <ogmaciel@gnome.org>
Date:   Thu Sep 6 09:08:17 2012 -0400

    Fixed path to accounts-plugin-widget.c file.

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

commit ce780de356a0b60d0e7058019397510018b092bd
Author: Arash Mousavi <mousavi.arash@gmail.com>
Date:   Thu Sep 6 17:02:34 2012 +0430

    l10n: Updated Persian translation

 po/fa.po | 4021
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 2112 insertions(+), 1909 deletions(-)

commit d001dd2ca3436cae899456994230b22e1c6ec6c7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Sep 6 10:12:44 2012 +0200

    UOA account plugins: move shared code to a shared lib

    Avoid to redefine existing symbols when different plugins are loaded.

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

 .../cc-plugins/account-plugins/Makefile.am         | 129
 +++++++--------------
 .../cc-plugins/generate-plugins.py                 |  25 +++-
 2 files changed, 64 insertions(+), 90 deletions(-)

commit b73b93e7cfb16579ef6ec18ef01acdac2c6c24f3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Sep 6 09:49:10 2012 +0200

    Move account plugins to their own dir

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

 configure.ac                                       |   1 +
 ubuntu-online-accounts/cc-plugins/Makefile.am      | 228 +----------
 .../cc-plugins/account-plugins/Makefile.am         | 225 +++++++++++
 .../account-plugins/empathy-accounts-plugin-aim.c  |  46 +++
 .../account-plugins/empathy-accounts-plugin-aim.h  |  75 ++++
 .../empathy-accounts-plugin-gadugadu.c             |  46 +++
 .../empathy-accounts-plugin-gadugadu.h             |  75 ++++
 .../empathy-accounts-plugin-groupwise.c            |  46 +++
 .../empathy-accounts-plugin-groupwise.h            |  75 ++++
 .../account-plugins/empathy-accounts-plugin-icq.c  |  46 +++
 .../account-plugins/empathy-accounts-plugin-icq.h  |  75 ++++
 .../account-plugins/empathy-accounts-plugin-irc.c  |  46 +++
 .../account-plugins/empathy-accounts-plugin-irc.h  |  75 ++++
 .../empathy-accounts-plugin-jabber.c               |  46 +++
 .../empathy-accounts-plugin-jabber.h               |  75 ++++
 .../empathy-accounts-plugin-local-xmpp.c           |  46 +++
 .../empathy-accounts-plugin-local-xmpp.h           |  75 ++++
 .../account-plugins/empathy-accounts-plugin-mxit.c |  46 +++
 .../account-plugins/empathy-accounts-plugin-mxit.h |  75 ++++
 .../empathy-accounts-plugin-myspace.c              |  46 +++
 .../empathy-accounts-plugin-myspace.h              |  75 ++++
 .../empathy-accounts-plugin-sametime.c             |  46 +++
 .../empathy-accounts-plugin-sametime.h             |  75 ++++
 .../account-plugins/empathy-accounts-plugin-sip.c  |  46 +++
 .../account-plugins/empathy-accounts-plugin-sip.h  |  75 ++++
 .../empathy-accounts-plugin-widget.c               | 431
 +++++++++++++++++++++
 .../empathy-accounts-plugin-widget.h               |  76 ++++
 .../empathy-accounts-plugin-yahoo.c                |  46 +++
 .../empathy-accounts-plugin-yahoo.h                |  75 ++++
 .../empathy-accounts-plugin-yahoojp.c              |  46 +++
 .../empathy-accounts-plugin-yahoojp.h              |  75 ++++
 .../empathy-accounts-plugin-zephyr.c               |  46 +++
 .../empathy-accounts-plugin-zephyr.h               |  75 ++++
 .../account-plugins/empathy-accounts-plugin.c      | 125 ++++++
 .../account-plugins/empathy-accounts-plugin.h      |  69 ++++
 .../cc-plugins/empathy-accounts-plugin-aim.c       |  46 ---
 .../cc-plugins/empathy-accounts-plugin-aim.h       |  75 ----
 .../cc-plugins/empathy-accounts-plugin-gadugadu.c  |  46 ---
 .../cc-plugins/empathy-accounts-plugin-gadugadu.h  |  75 ----
 .../cc-plugins/empathy-accounts-plugin-groupwise.c |  46 ---
 .../cc-plugins/empathy-accounts-plugin-groupwise.h |  75 ----
 .../cc-plugins/empathy-accounts-plugin-icq.c       |  46 ---
 .../cc-plugins/empathy-accounts-plugin-icq.h       |  75 ----
 .../cc-plugins/empathy-accounts-plugin-irc.c       |  46 ---
 .../cc-plugins/empathy-accounts-plugin-irc.h       |  75 ----
 .../cc-plugins/empathy-accounts-plugin-jabber.c    |  46 ---
 .../cc-plugins/empathy-accounts-plugin-jabber.h    |  75 ----
 .../empathy-accounts-plugin-local-xmpp.c           |  46 ---
 .../empathy-accounts-plugin-local-xmpp.h           |  75 ----
 .../cc-plugins/empathy-accounts-plugin-mxit.c      |  46 ---
 .../cc-plugins/empathy-accounts-plugin-mxit.h      |  75 ----
 .../cc-plugins/empathy-accounts-plugin-myspace.c   |  46 ---
 .../cc-plugins/empathy-accounts-plugin-myspace.h   |  75 ----
 .../cc-plugins/empathy-accounts-plugin-sametime.c  |  46 ---
 .../cc-plugins/empathy-accounts-plugin-sametime.h  |  75 ----
 .../cc-plugins/empathy-accounts-plugin-sip.c       |  46 ---
 .../cc-plugins/empathy-accounts-plugin-sip.h       |  75 ----
 .../cc-plugins/empathy-accounts-plugin-widget.c    | 431
 ---------------------
 .../cc-plugins/empathy-accounts-plugin-widget.h    |  76 ----
 .../cc-plugins/empathy-accounts-plugin-yahoo.c     |  46 ---
 .../cc-plugins/empathy-accounts-plugin-yahoo.h     |  75 ----
 .../cc-plugins/empathy-accounts-plugin-yahoojp.c   |  46 ---
 .../cc-plugins/empathy-accounts-plugin-yahoojp.h   |  75 ----
 .../cc-plugins/empathy-accounts-plugin-zephyr.c    |  46 ---
 .../cc-plugins/empathy-accounts-plugin-zephyr.h    |  75 ----
 .../cc-plugins/empathy-accounts-plugin.c           | 125 ------
 .../cc-plugins/empathy-accounts-plugin.h           |  69 ----
 .../cc-plugins/generate-plugins.py                 |  33 +-
 68 files changed, 2637 insertions(+), 2640 deletions(-)

commit 006b27d7f0c5dd6efeee83e2c7bb21a60a7a138e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Sep 5 15:59:26 2012 +0200

    Generate one GType per UOA protocol plugin

    Each plugin now has its own GType inheriting from
    EmpathyAccountsPlugin which
    is cleaner.

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

 ubuntu-online-accounts/cc-plugins/Makefile.am      |  28 ++++
 .../cc-plugins/empathy-accounts-plugin-aim.c       |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-aim.h       |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-gadugadu.c  |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-gadugadu.h  |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-groupwise.c |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-groupwise.h |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-icq.c       |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-icq.h       |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-irc.c       |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-irc.h       |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-jabber.c    |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-jabber.h    |  75 ++++++++++
 .../empathy-accounts-plugin-local-xmpp.c           |  46 ++++++
 .../empathy-accounts-plugin-local-xmpp.h           |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-mxit.c      |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-mxit.h      |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-myspace.c   |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-myspace.h   |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-sametime.c  |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-sametime.h  |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-sip.c       |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-sip.h       |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-yahoo.c     |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-yahoo.h     |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-yahoojp.c   |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-yahoojp.h   |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin-zephyr.c    |  46 ++++++
 .../cc-plugins/empathy-accounts-plugin-zephyr.h    |  75 ++++++++++
 .../cc-plugins/empathy-accounts-plugin.c           |   6 -
 .../cc-plugins/empathy-accounts-plugin.h           |   2 -
 .../cc-plugins/generate-plugins.py                 | 159
 ++++++++++++++++++++-
 32 files changed, 1880 insertions(+), 9 deletions(-)

commit a49a0e8b08ff8ad164304f0600b90178b0ff44c6
Author: Andika Triwidada <andika@gmail.com>
Date:   Thu Sep 6 15:45:36 2012 +0700

    Updated Indonesian translation

 po/id.po | 59 ++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 25 deletions(-)

commit 05f557bd0ff44bdece4bb0b2f25e86ccb693e35d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Sep 6 10:01:18 2012 +0200

    update tests/interactive/.gitignore

 tests/interactive/.gitignore | 2 ++
 1 file changed, 2 insertions(+)

commit 720b107aa539f8e39d5ab57d4b9fcbf013f6d501
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Wed Sep 5 19:35:57 2012 +0200

    Updated Polish translation

 po/pl.po | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

commit 5249fdf07c03b0e9bc873ace2a66a7b861fd41c2
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:   Wed Sep 5 21:35:13 2012 +0530

    updated Tamil translation

 po/ta.po | 45 ++++++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 19 deletions(-)

commit 7bbdfa8b65593f667e9ef72178469e78cba52638
Author: Alexandre Franke <alexandre.franke@gmail.com>
Date:   Wed Sep 5 15:56:32 2012 +0200

    Update French translation

 po/fr.po | 3024
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1505 insertions(+), 1519 deletions(-)

commit 52028717069c3fdd56e4228882819b31bf678c32
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Wed Sep 5 12:42:05 2012 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 58 +++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 25 deletions(-)

commit 293da11af4379e0b1ccf2a16a3bb05ad59375122
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:   Wed Sep 5 11:53:28 2012 +0200

    Updated Serbian translation

 po/sr.po       | 120
 ++++++++++++++++++++++++++++++++-------------------------
 po/sr@latin.po | 120
 ++++++++++++++++++++++++++++++++-------------------------
 2 files changed, 134 insertions(+), 106 deletions(-)

commit 5f06612af11571b8bdf69f2150a3746a9b7cf94a
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Wed Sep 5 10:32:15 2012 +0200

    Updated Galician translations

 po/gl.po | 51 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

commit 33f34abc1f83821cb55cfa1a8f4e3e136974bd1f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Sep 4 15:04:25 2012 +0200

    roster-window: display a button to go online

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

 src/empathy-roster-window.c  | 22 ++++++++++++++++++++++
 src/empathy-roster-window.ui | 26 ++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

commit 34789c7c8447174ec0881e2abbf029ae34a37c99
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Sep 4 14:39:02 2012 +0200

    display_page_message: use a flag instead of booleans

    More scalable.

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

 src/empathy-roster-window.c | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

commit e52959e0abfcfa322bf3e0e7587e62f1d49d8699
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Sep 4 14:34:10 2012 +0200

    roster-window: display a specific message when we are offline

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

 src/empathy-roster-window.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 20a856d61a04345ceb91919dc965ae19522da10b
Author: Bruce Cowan <bruce@bcowan.me.uk>
Date:   Tue Sep 4 11:54:05 2012 +0100

    Updated British English translation

 po/en_GB.po | 3707
 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 1822 insertions(+), 1885 deletions(-)

commit 3f326c718659425fd2570ef0a2aba3fcefa7731c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Sep 4 11:22:09 2012 +0200

    remove released flag

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