commit eaf4d6ef2120a4eb05f6ffcde49ab471c056a6d1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Oct 24 16:52:50 2011 +0200

    prepare 3.2.1.1

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

commit 7e6126e5936a049436b2c56a796279ed164c3595
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Oct 18 18:32:52 2011 +0200

    theme_adium_append_message: escape alias before displaying it

    Not doing so can lead to nasty HTML injection from hostile users.

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

 libempathy-gtk/empathy-theme-adium.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

commit f46371d463e7eda28bd7a123489ec9bfb9625e75
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 21 14:55:18 2011 +0200

    ensure that contact_list_store_contact_active_cb isn't called after
    the store destruction

    This is an exact port of similar code from empathy-individual-store.

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

 libempathy-gtk/empathy-contact-list-store.c |   43
 +++++++++++++++++++++++---
 1 files changed, 38 insertions(+), 5 deletions(-)

commit af48539d2a169556fc6749232d55c9661d98771e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 21 14:52:02 2011 +0200

    contact_list_store_dispose: unset the timer ids

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

 libempathy-gtk/empathy-contact-list-store.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

commit 07aabe75df7e32355c5273ed9f3a831eaf01b340
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Oct 24 10:31:55 2011 +0200

    theme-adium: escape the name in actions as well

 libempathy-gtk/empathy-theme-adium.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

commit e4e68f73b30c881ea136e30c5c3bc9f1aab7f1c5
Author: Arash Mousavi <amousavi@src.gnome.org>
Date:   Mon Oct 24 01:51:52 2011 +0330

    Updated Persian Translation

 po/fa.po |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

commit ac1badaf9730ca005d3b7d626aaed70ec79199bb
Author: Arash Mousavi <amousavi@src.gnome.org>
Date:   Mon Oct 24 01:49:37 2011 +0330

    Updated Persian Translation

 po/fa.po |  559
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 295 insertions(+), 264 deletions(-)

commit 9ee011602c536a42a366af49550f8839341e4f6d
Author: Marek Černocký <marek@manet.cz>
Date:   Fri Oct 21 23:39:23 2011 +0200

    Updated Czech translation

 po/cs.po |  185
 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 96 insertions(+), 89 deletions(-)

commit 17c07e1ad23fe76dcb0a03d61ca4bed2539a7920
Author: Djavan Fagundes <djavanf@gnome.org>
Date:   Thu Oct 20 16:42:16 2011 -0200

    Fixed Brazilian Portuguese translation

 po/pt_BR.po |  380
 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 192 insertions(+), 188 deletions(-)

commit 7b51c13984edb9a2fe102323a87a8d717663feb8
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:   Thu Oct 20 01:06:43 2011 +0200

    Fix an article in the Hungarian help translation

 help/hu/hu.po |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 627c3c302e3ca82813b2ba7b5ac24850927cc274
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Oct 17 16:56:54 2011 +0200

    remove released flag

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