commit 844d2fc0bc1601384213f76c58c850a049c94ec1
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sat Oct 13 16:13:41 2012 -0400

    NEWS release for 3.6.1 release.

 NEWS |   34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

commit c9a4cf4090aa299d1dc33a46880b0d05df498df7
Author: Alexander Shopov <ash@kambanaria.org>
Date:   Sat Oct 13 17:31:27 2012 +0300

    Updated Bulgarian translation

 po/bg.po | 2703 ++++++++++----------------------------------------------------
 1 file changed, 434 insertions(+), 2269 deletions(-)

commit 820f821dc861d03ab7461fcb0529b0efac66d7b9
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Fri Oct 12 00:27:41 2012 +0200

    Updated Norwegian bokmål translation.

 po/nb.po | 1132 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 566 insertions(+), 566 deletions(-)

commit af2851bf222497d404b0cf8539adc3d600e7c959
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Oct 9 17:48:50 2012 -0400

    Bug 685675 - Fix packing of spell check language options
    
    Word-wrapped GtkLabels and GtkTables just don't seem to get along.
    The vertical allocation for the GtkLabel was way too big.  Replace
    the GtkTable with a GtkGrid.
    
    (cherry picked from commit 2b46866a5c311283f2d67cbf00802e47b308ec16)

 mail/mail-config.ui              |   74 +++++++++++++++++++-------------------
 modules/mail/em-composer-prefs.c |   12 +------
 2 files changed, 39 insertions(+), 47 deletions(-)

commit dbd8378954fe3161aba153821ec04060235c17fa
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Oct 9 16:55:08 2012 -0400

    Bug 684691 - EMailConfigFormatHTML: Signal handler never disconnected
    
    EMailConfigFormatHTML listens for "changed" signals from a GSettings
    instance, passing itself as the 'user_data' to the signal handler.  But
    the signal handler was left connected after EMailConfigFormatHTML was
    finalized, resulting in the signal handler receiving a dangling pointer.
    
    Not using g_signal_connect_object() here because of the unresolved
    reference leak issue in GObject.  The GSettings instance is likely
    cached internally and lives well beyond the EMailConfigFormatHTML.
    
    (cherry picked from commit 4483209dba2d421d814fae5dc31e5597fcacd612)

 modules/mail/e-mail-config-format-html.c |   92 +++++++++++++++++++-----------
 1 file changed, 59 insertions(+), 33 deletions(-)

commit 092a504759f8966c9e37c7cdd079f98290be4c07
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Oct 9 14:27:41 2012 -0400

    EBookConfigNameSelectorEntry: Use G_DEFINE_DYNAMIC_TYPE.
    
    Follow the usual GObject conventions.
    
    (cherry picked from commit d181e003cadfc3be2ac8b8ad020b110b94c08356)

 .../e-book-config-name-selector-entry.c            |   84 ++++++++++----------
 .../e-book-config-name-selector-entry.h            |   40 +++++++++-
 modules/addressbook/evolution-module-addressbook.c |    2 +-
 3 files changed, 82 insertions(+), 44 deletions(-)

commit d4b88c112f9e6974108d5a4a76f954cd78e62e8a
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Oct 9 14:00:00 2012 -0400

    ECalConfigView: Use G_DEFINE_DYNAMIC_TYPE.
    
    Follow the usual GObject conventions.
    
    (cherry picked from commit 55d5344510bd2991259d9b202988024b00c957d8)

 modules/calendar/e-cal-config-view.c         |   59 +++++++++++++++-----------
 modules/calendar/e-cal-config-view.h         |   37 +++++++++++++++-
 modules/calendar/evolution-module-calendar.c |    2 +-
 3 files changed, 71 insertions(+), 27 deletions(-)

commit cf82970e660fb2f147a9572d0cd61113f3a82de3
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Oct 9 13:48:17 2012 -0400

    ECalConfigModel: Use G_DEFINE_DYNAMIC_TYPE.
    
    Follow the usual GObject conventions.
    
    (cherry picked from commit 09438389c17a2b542d3c055e287f22fa3a1b6513)

 modules/calendar/e-cal-config-model.c        |   59 +++++++++++++++-----------
 modules/calendar/e-cal-config-model.h        |   39 ++++++++++++++++-
 modules/calendar/evolution-module-calendar.c |    2 +-
 3 files changed, 73 insertions(+), 27 deletions(-)

commit 1889a59ae90663481709429f0813206263761ed2
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Oct 9 13:35:08 2012 -0400

    ECalConfigMeetingTimeSelector: Use G_DEFINE_DYNAMIC_TYPE.
    
    Follow the usual GObject conventions.
    
    (cherry picked from commit 51e192f235cda7d70d76974ac4522280264fd011)

 .../calendar/e-cal-config-meeting-time-selector.c  |   62 ++++++++++++--------
 .../calendar/e-cal-config-meeting-time-selector.h  |   40 ++++++++++++-
 modules/calendar/evolution-module-calendar.c       |    2 +-
 3 files changed, 77 insertions(+), 27 deletions(-)

commit 04b253ea0689221e0c0e49907c053ce4849eeb0b
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Oct 9 13:20:44 2012 -0400

    ECalConfigMeetingStore: Use G_DEFINE_DYNAMIC_TYPE.
    
    Follow the usual GObject conventions.
    
    (cherry picked from commit 27e8442447fccab49ffbf3be3d2d520bfbd5f6ba)

 modules/calendar/e-cal-config-meeting-store.c |   61 +++++++++++++++----------
 modules/calendar/e-cal-config-meeting-store.h |   39 +++++++++++++++-
 modules/calendar/evolution-module-calendar.c  |    2 +-
 3 files changed, 75 insertions(+), 27 deletions(-)

commit 3964b272b70e87bf93bd26a1d2303496ea0b2b6c
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Oct 9 13:03:47 2012 -0400

    ECalConfigDateEdit: Use G_DEFINE_DYNAMIC_TYPE.
    
    Follow the usual GObject conventions.
    
    (cherry picked from commit 6fd48fd4df20ebf76382ebb441e81e85be7e3719)

 modules/calendar/e-cal-config-date-edit.c    |   60 +++++++++++++++-----------
 modules/calendar/e-cal-config-date-edit.h    |   39 ++++++++++++++++-
 modules/calendar/evolution-module-calendar.c |    2 +-
 3 files changed, 74 insertions(+), 27 deletions(-)

commit d7d55d68842fa62bc2740dc9d8ae53f435ea9c81
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Oct 9 12:45:27 2012 -0400

    ECalConfigCompEditor: Use G_DEFINE_DYNAMIC_TYPE.
    
    Follow the usual GObject conventions.
    
    (cherry picked from commit 5938ad7e8f0b3cf223b41bf942d9d1a9a0a42d2e)

 modules/calendar/e-cal-config-comp-editor.c  |   60 +++++++++++++++-----------
 modules/calendar/e-cal-config-comp-editor.h  |   39 ++++++++++++++++-
 modules/calendar/evolution-module-calendar.c |    2 +-
 3 files changed, 74 insertions(+), 27 deletions(-)

commit be97226dbd90a223a41052dae6ed944d145c9554
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Oct 9 12:22:09 2012 -0400

    ECalConfigCalendarItem: Use G_DEFINE_DYNAMIC_TYPE.
    
    Follow the usual GObject conventions.
    
    (cherry picked from commit 8454897696ac622d8cf0a452a1b2b8fb20adedbf)

 modules/calendar/e-cal-config-calendar-item.c |   61 +++++++++++++++----------
 modules/calendar/e-cal-config-calendar-item.h |   40 +++++++++++++++-
 modules/calendar/evolution-module-calendar.c  |    2 +-
 3 files changed, 76 insertions(+), 27 deletions(-)

commit 93d1a9995d189b0094f59113099c62e7e0a7bde3
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Oct 9 11:31:26 2012 -0400

    EMailConfigWebView: Use G_DEFINE_DYNAMIC_TYPE.
    
    Follow the usual GObject conventions.
    
    (cherry picked from commit 9cee475a1a6579e0816d5ad36eca9ba9a29f9353)

 modules/mail/e-mail-config-web-view.c |  126 +++++++++++++++++----------------
 modules/mail/e-mail-config-web-view.h |   38 +++++++++-
 modules/mail/evolution-module-mail.c  |    2 +-
 3 files changed, 103 insertions(+), 63 deletions(-)

commit 0a1c7eb6d38a8b4094c75ae3d90f7e5fbbaf256b
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Oct 9 11:13:38 2012 -0400

    EMailConfigReader: Use G_DEFINE_DYNAMIC_TYPE.
    
    Follow the usual GObject conventions.
    
    (cherry picked from commit 5acc8469ce861b90aad0f2d84061d2b6cc205f80)

 modules/mail/e-mail-config-reader.c  |   60 ++++++++++++++++++++--------------
 modules/mail/e-mail-config-reader.h  |   39 ++++++++++++++++++++--
 modules/mail/evolution-module-mail.c |    2 +-
 3 files changed, 74 insertions(+), 27 deletions(-)

commit bdbd225c389a38b8cfebfe703ed5b3d9bca6c523
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Oct 9 10:01:05 2012 -0400

    EMailConfigFormatHTML: Use G_DEFINE_DYNAMIC_TYPE.
    
    Follow the usual GObject conventions.
    
    (cherry picked from commit c3eacfd37e5275942635c069e6f20eb0dd22f6be)

 modules/mail/e-mail-config-format-html.c |   61 ++++++++++++++++++------------
 modules/mail/e-mail-config-format-html.h |   40 +++++++++++++++++++-
 modules/mail/evolution-module-mail.c     |    2 +-
 3 files changed, 76 insertions(+), 27 deletions(-)

commit d0734298d21c5a59ed408910b552d7c4ffa79577
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Mon Oct 8 23:27:29 2012 +0200

    Bug #684447 - Fallback to text/plain when highlight program is missing or fails
    
    We can't add a new dependency to Evolution 3.6, but the runtime
    check will fallback to text/plain formatter when highlight program
    is missing (or when it crashes or fails).
    
    (cherry-picked from 5437fa7c354b5ddf12b4e13136834d86168e3580)

 em-format/e-mail-formatter-text-plain.c            |    1 +
 .../e-mail-formatter-text-highlight.c              |   85 +++++++++++++-------
 2 files changed, 55 insertions(+), 31 deletions(-)

commit ceda9fa5e742b511886335078cce6f5d2667295f
Author: Antoine Jacoutot <ajacoutot@gnome.org>
Date:   Thu Oct 4 15:34:23 2012 +0200

    portability: don't use too generic variable names
    
    OpenBSD (and maybe other OS) already declare stdout and stdin in <stdio.h>
    which breaks evolution build, so prefix both with "pipe_" to prevent clashing.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=685471
    
    (cherry picked from commit 1cfe0327ca436a687383412664e3a5c2869c7dda)

 modules/text-highlight/e-mail-formatter-text-highlight.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit ca58cf13e42923b60a9add57e39e7e0ef79765e3
Author: Theppitak Karoonboonyanan <thep@linux.thai.net>
Date:   Thu Oct 4 14:40:53 2012 +0700

    Updated Thai translation

 po/th.po | 2393 +++++++++++---------------------------------------------------
 1 file changed, 409 insertions(+), 1984 deletions(-)

commit 1c691a12fde923987533f21b0ccd80598bcd03d6
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Oct 4 02:04:57 2012 -0400

    Bug 684249 - Signatures get compounded, not replaced
    
    (cherry picked from commit d495e19945acbb5cce9eef4578103927569733fa)

 composer/e-composer-private.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 76a505f314595693ed529ecd1aa79017d263ba4e
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date:   Thu Oct 4 10:31:07 2012 +0700

    po/vi: am/pm translations are too long, use original strings

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

commit fa8b3e34b5b6ee752d677eb11fb21e6fcd2bf9ac
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Wed Oct 3 16:15:36 2012 -0400

    Fix contact maps.
    
    I broke contact maps when I removed the settings capplet.
    
    The contact maps feature uses clutter-gtk, so we still need to call
    gtk_clutter_init_with_args() instead of gtk_init_with_args() if the
    contact maps feature is enabled.
    
    (cherry picked from commit 2634f04217b160d671e11efc6adf64244b022750)

 shell/Makefile.am |    8 ++++----
 shell/main.c      |   13 +++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

commit ac713c7d3e47b00ad478695983c783eab283563c
Author: Sasi Bhushan Boddepalli <sasi@swecha.net>
Date:   Wed Oct 3 18:47:49 2012 +0530

    Updated Telugu Translation

 po/te.po | 1470 ++++++++++++++++++--------------------------------------------
 1 file changed, 413 insertions(+), 1057 deletions(-)

commit 3b9e89342c0e56bce46a5fe43c117a0df891c235
Author: Akom Chotiphantawanon <knight2000@gmail.com>
Date:   Mon Oct 1 15:50:35 2012 +0700

    Updated Thai translation

 po/th.po |35387 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 18747 insertions(+), 16640 deletions(-)

commit 8f0c011eb845e6386be0452d371c59126f56ff2f
Author: Žygimantas Beručka <uid0@akl.lt>
Date:   Sun Sep 30 14:05:31 2012 +0300

    Updated Lithuanian translation

 po/lt.po | 4296 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 2608 insertions(+), 1688 deletions(-)

commit 4844ec51c4e932a909632a36d70f3962e31fd9f6
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:   Wed Sep 26 01:43:04 2012 +0200

    [l10n] Updated Catalan (Valencian) translation

 po/ca@valencia.po |18246 +++++++++++++++++++++++++++--------------------------
 1 file changed, 9168 insertions(+), 9078 deletions(-)

commit 5dc8656e7b254e2efa6fcee94e3d7ef84baff067
Author: Gil Forcada <gforcada@gnome.org>
Date:   Wed Sep 26 01:40:46 2012 +0200

    [l10n] Updated Catalan translation

 po/ca.po |18173 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 9237 insertions(+), 8936 deletions(-)

commit b1d3b77e9130d924e290e3255392718480e5569e
Author: Daniel Korostil <ted.korostiled@gmail.com>
Date:   Tue Sep 25 23:15:17 2012 +0300

    Added uk translation

 po/uk.po |  856 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 416 insertions(+), 440 deletions(-)

commit e167df9b0a605afeaa644ae22981d342d1b8edf7
Author: Petr Kovar <pkovar@redhat.com>
Date:   Mon Sep 24 15:30:25 2012 +0200

    Updated Czech translation by Jiri Eischmann

 po/cs.po |18712 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 9549 insertions(+), 9163 deletions(-)

commit 5933d4d03b01047e93e75873d7b9fc5b92fe5342
Author: Flemming Christensen <fc@stromata.dk>
Date:   Mon Sep 24 12:43:48 2012 +0200

    Updated Danish translation

 po/da.po |17776 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 9038 insertions(+), 8738 deletions(-)

commit aa39b3db38fa914bc131206308dd6cc8c7680bbf
Author: Sweta Kothari <swkothar@redhat.com>
Date:   Mon Sep 24 14:37:31 2012 +0530

    Updated gujarati file

 po/gu.po |  129 +++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 106 insertions(+), 23 deletions(-)

commit 944c0a53f87ea9067443079e37936a3760e18217
Author: Timo Jyrinki <timo.jyrinki@iki.fi>
Date:   Mon Sep 24 10:29:44 2012 +0300

    Updated Finnish translation by Jiri Grönroos.

 po/fi.po |19970 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 11003 insertions(+), 8967 deletions(-)

commit 85576aa1fa663d0402df281e1cb9c9e2a6704842
Author: Alexandre Franke <alexandre.franke@gmail.com>
Date:   Sun Sep 23 23:41:17 2012 +0200

    Update French translation

 help/fr/figures/new-mail-switcher.png |  Bin 7175 -> 16179 bytes
 help/fr/figures/window-overview.png   |  Bin 0 -> 197966 bytes
 help/fr/fr.po                         |20774 +++++++++++++++++----------------
 3 files changed, 10471 insertions(+), 10303 deletions(-)

commit 455478c836201fce20a305ac2ac4e588eb9a60a4
Author: Ani Peter <apeter@redhat.com>
Date:   Sun Sep 23 15:14:14 2012 +0530

    Updated Malayalam file

 po/ml.po |  668 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 310 insertions(+), 358 deletions(-)

commit a0617d81e05f2cb282fb9aebd908159da40b60ff
Author: Ani Peter <apeter@redhat.com>
Date:   Sun Sep 23 13:37:57 2012 +0530

    Updated Malayalam file

 po/ml.po |  527 ++++++++++++++++++++++----------------------------------------
 1 file changed, 185 insertions(+), 342 deletions(-)

commit 7889b57c3d67782693334979f99fce36bd1be8b1
Author: Ani Peter <apeter@redhat.com>
Date:   Sun Sep 23 02:42:54 2012 +0530

    Updated Malayalam file

 po/ml.po |25750 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 12252 insertions(+), 13498 deletions(-)

commit d539e173f7688d985a8bd91dccf0057fbef58f0e
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sat Sep 22 14:04:46 2012 -0400

    Post-release version bump.

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

commit 73d49d2fd9c5ef86ac48a57e8e3344265202c302
Author: Sweta Kothari <swkothar@redhat.com>
Date:   Sat Sep 22 22:31:11 2012 +0530

    Updated gujarati file

 po/gu.po |  169 ++++++++++++++++++++++++--------------------------------------
 1 file changed, 66 insertions(+), 103 deletions(-)