commit db9f546c5b938fbe33a81b99e03a843979d5de41
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Apr 21 16:50:46 2011 -0400

    NEWS update for 2.32.3 release.

 NEWS |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

commit 9ee22a4696a171a48910a0fa2a4410af9efef09b
Author: hao.h.li <hao.h.li@intel.com>
Date:   Fri Feb 18 14:40:52 2011 +0100

    Bug #639483 - Category list includes weather information
    (cherry picked from commit 8f847c4672a559d4a0523c691f262d769337a910)

 libedataserverui/e-categories-dialog.c    |    4 ++++
 libedataserverui/e-category-completion.c  |    6 ++++++
 libedataserverui/e-name-selector-dialog.c |    8 +++++++-
 3 files changed, 17 insertions(+), 1 deletions(-)

commit 4b39f926c3c34dfca80d06275ca0a183bc44ce3d
Author: Milan Crha <mcrha@redhat.com>
Date:   Tue Apr 19 12:13:57 2011 +0200

    Bug #645783 - Return safe paths from CamelService::get_path()
    (cherry picked from commit de8f0fcd81534a60b81fa1802e75910556a3ab6f)

 camel/camel-service.c |   70 +++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 57 insertions(+), 13 deletions(-)

commit 4159a544f4f2f2d6c517d0f3e0ce9fc88406dc2b
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Tue Apr 19 17:37:33 2011 +0100

    Revert "Bug #645783 - Return safe paths from CamelService::get_path()"
    
    This reverts commit c25eab6d039c4594a529ce24bbfdb344deb031ff, which was
    unmerged, didn't build, and didn't correctly reference the upstream commit
    that it was based on.
    
    Bad Fridrich; no biscuit

 camel/camel-service.c |   75 ++++++------------------------------------------
 1 files changed, 10 insertions(+), 65 deletions(-)

commit c25eab6d039c4594a529ce24bbfdb344deb031ff
Author: Milan Crha <mcrha@redhat.com>
Date:   Tue Apr 19 12:13:57 2011 +0200

    Bug #645783 - Return safe paths from CamelService::get_path()

 camel/camel-service.c |   75 ++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 65 insertions(+), 10 deletions(-)

commit 021d08e61397a8322280679d21c01ef1ce91875b
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Fri Apr 15 20:34:47 2011 +0100

    Pull in translations from Evolution for "On This Computer"
    (cherry picked from commit 6ec5e4ab33dc1fef42424b986467922cbf787919)

 po/am.po          |    4 ++++
 po/ar.po          |    4 ++++
 po/as.po          |    4 ++++
 po/ast.po         |    4 ++++
 po/az.po          |    4 ++++
 po/be.po          |    4 ++++
 po/bg.po          |    4 ++++
 po/bn.po          |    4 ++++
 po/bn_IN.po       |    4 ++++
 po/bs.po          |    4 ++++
 po/ca.po          |    4 ++++
 po/ca@valencia.po |    4 ++++
 po/cs.po          |    4 ++++
 po/cy.po          |    7 ++++---
 po/da.po          |    4 ++++
 po/de.po          |    4 ++++
 po/dz.po          |    4 ++++
 po/el.po          |    4 ++++
 po/en@shaw.po     |    4 ++++
 po/en_AU.po       |    4 ++++
 po/en_CA.po       |    4 ++++
 po/en_GB.po       |    4 ++++
 po/es.po          |    4 ++++
 po/et.po          |    4 ++++
 po/eu.po          |    4 ++++
 po/fa.po          |    4 ++++
 po/fi.po          |    4 ++++
 po/fr.po          |    4 ++++
 po/ga.po          |    4 ++++
 po/gl.po          |    4 ++++
 po/gu.po          |    4 ++++
 po/he.po          |    7 ++++---
 po/hi.po          |    4 ++++
 po/hr.po          |    4 ++++
 po/hu.po          |    4 ++++
 po/id.po          |    4 ++++
 po/is.po          |    1 +
 po/it.po          |    4 ++++
 po/ja.po          |    4 ++++
 po/ka.po          |    4 ++++
 po/kn.po          |    4 ++++
 po/ko.po          |    4 ++++
 po/ku.po          |    4 ++++
 po/lt.po          |    4 ++++
 po/lv.po          |    4 ++++
 po/mai.po         |    4 ++++
 po/mk.po          |    4 ++++
 po/ml.po          |    4 ++++
 po/mn.po          |    4 ++++
 po/mr.po          |    4 ++++
 po/ms.po          |    4 ++++
 po/nb.po          |    4 ++++
 po/ne.po          |    4 ++++
 po/nl.po          |    4 ++++
 po/nn.po          |    4 ++++
 po/oc.po          |    4 ++++
 po/or.po          |    4 ++++
 po/pa.po          |    4 ++++
 po/pl.po          |    4 ++++
 po/pt.po          |    4 ++++
 po/pt_BR.po       |    4 ++++
 po/ro.po          |    4 ++++
 po/ru.po          |    4 ++++
 po/rw.po          |    4 ++++
 po/si.po          |    4 ++++
 po/sk.po          |    4 ++++
 po/sl.po          |    4 ++++
 po/sq.po          |    4 ++++
 po/sr.po          |    4 ++++
 po/sr@latin.po    |    4 ++++
 po/sv.po          |    4 ++++
 po/ta.po          |    4 ++++
 po/te.po          |    4 ++++
 po/th.po          |    4 ++++
 po/tr.po          |    4 ++++
 po/uk.po          |    4 ++++
 po/vi.po          |    4 ++++
 po/wa.po          |    1 +
 po/xh.po          |    4 ++++
 po/zh_CN.po       |    4 ++++
 po/zh_HK.po       |    4 ++++
 po/zh_TW.po       |    4 ++++
 82 files changed, 322 insertions(+), 6 deletions(-)

commit 4c622668652222c6d7817eb5c3c6bbc562073573
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Fri Apr 15 12:19:00 2011 +0100

    Bug 647873 [2/2] - e_cal_new_system_foo() should create source in GConf
    (cherry picked from commit 3bb75464a6774b25cacb070959f4eb0465fd665c)

 calendar/libecal/e-cal.c |   56 +++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 53 insertions(+), 3 deletions(-)

commit e6b134fd713addacc770e25f751235ff168fbf66
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Fri Apr 15 12:20:04 2011 +0100

    Bug 647873 [1/2] - Fix comparison of URI in e_cal_new_from_uri().
    
    If the URI only had a relative_uri property, we should build the full URI
    for comparison rather than just skipping it. Otherwise we get false
    mismatches.
    (cherry picked from commit 05c0b7b4bd06c9df459626e09713746d5efa2169)

 calendar/libecal/e-cal.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

commit 2636470bfca9102e585f9dfa2ec2ae1b37d455fd
Author: Milan Crha <mcrha@redhat.com>
Date:   Mon Mar 14 11:21:14 2011 +0100

    Bug #644532 - Crash when opening ESource with local:/system URI
    (cherry picked from commit 1443076ae96133f7046f7ea96cb39352f0ca4508)

 addressbook/libedata-book/e-data-book-factory.c |   12 ++++++++++++
 calendar/libedata-cal/e-data-cal-factory.c      |    5 ++++-
 libedataserver/e-source.c                       |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

commit 7438c18341630861e5ce7a00067d4b3fc3e1f1ab
Author: Milan Crha <mcrha@redhat.com>
Date:   Thu Mar 3 11:22:29 2011 +0100

    e_source_copy() may copy also relative_uri
    (cherry picked from commit fc9462d477b098b8f15db5cde3952db6d92e2868)

 libedataserver/e-source.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 30d8144a673a991dd5dd9769fe8ac3de6c18f459
Author: Milan Crha <mcrha@redhat.com>
Date:   Thu Jan 27 13:35:52 2011 +0100

    Bug #623933 - Crash under ESourceList::conf_changed_callback
    (cherry picked from commit 07b4da9552be95f2da37c3ed5a87ee80cc5443fa)

 libedataserver/e-source-list.c |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

commit 9268d26b4a2c82eb7c6d86102e763c0b28e57f74
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Fri Apr 1 21:53:04 2011 +0100

    Infer NTLM domain from username; don't assume it matches the server's domain
    (cherry picked from commit d331e6f04c69b306d21b9ce6ca530dd6d3e1f213)

 camel/camel-sasl-ntlm.c |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

commit f2007779595e7c60b124f04b8df313460bf3cfaa
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Tue Mar 22 10:11:09 2011 +0000

    Support NTLMv2 in camel-sasl-ntlm.c
    
    This still isn't good enough; we need to support calling out to
    /usr/bin/ntlm_auth to handle the challenge/response *for* us, for
    single-sign-on so that we don't need to know the password for ourselves.
    (cherry picked from commit e31811597c0afc8fbf932b40617ee6b8c022ea9e)

 camel/camel-sasl-ntlm.c |   52 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 46 insertions(+), 6 deletions(-)

commit ca3f7b613b1594482034b91270076e5e74c25248
Author: Milan Crha <mcrha@redhat.com>
Date:   Mon Feb 21 13:16:42 2011 +0100

    Bug #640829 - Can drop text/plain message lines in message preview
    (cherry picked from commit b0dfd4aeb2b44d56f701efca1508d2c8c6911724)

 camel/camel-mime-filter.c |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

commit 04b57d4987a1950a60d6e4878426b8a256845230
Author: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>
Date:   Sun Mar 20 17:50:21 2011 +0200

    Updated Latvian translation.

 po/lv.po | 6519 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 3629 insertions(+), 2890 deletions(-)

commit 947d5e9dddbf1c7582194ac170ff69d2960a6d3a
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Thu Mar 17 11:25:21 2011 +0200

    Updated Hebrew translation.

 po/he.po |  506 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 255 insertions(+), 251 deletions(-)

commit 713cd2669b4da8104b6640cc85d9346e0ddf52fa
Author: Fridrich Štrba <fridrich.strba@bluewin.ch>
Date:   Thu Feb 17 15:30:59 2011 +0100

    Miscellaneous build fixes for Windows

 camel/camel-sasl-gssapi.c                     |    7 +++++--
 camel/providers/local/Makefile.am             |   12 ++++++------
 camel/providers/local/camel-maildir-store.c   |   22 +++++++++++-----------
 camel/providers/local/camel-maildir-summary.c |    6 +++++-
 camel/providers/local/camel-mh-store.c        |    2 +-
 libedataserverui/e-name-selector-dialog.c     |    4 ++++
 6 files changed, 32 insertions(+), 21 deletions(-)

commit 9e13c3c5c46a9280feff2c5ff96d5aabba344d45
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Feb 6 01:13:47 2011 -0500

    Post-release version bump.

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