commit b9321f4a37d38105a74b1b4640b993bbb9bb142b
Author: Xan Lopez <xan@igalia.com>
Date:   Tue Oct 16 11:01:05 2012 +0200

    [release] 3.6.1

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

commit 845fdfc675220fcbf257d13129f386946a89cb52
Author: Xan Lopez <xan@igalia.com>
Date:   Mon Oct 15 20:24:24 2012 +0200

    ephy-web-view: do not automatically download embedded objects
    
    Only download mime types we cannot handle when they belong to the main
    resource. Prevents us from downloading garbage present in <object>
    files, among other things.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=683635

 embed/ephy-web-view.c |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

commit 09c7c90335289f2943bbc4c1f34e217b20c41d40
Author: Xan Lopez <xan@igalia.com>
Date:   Mon Oct 15 20:23:49 2012 +0200

    ephy-web-view: remove handling of Content-Disposition 'attachment'
    
    WebKit already does exactly the same thing automatically, no need to
    handle it here.

 embed/ephy-web-view.c |   25 -------------------------
 1 files changed, 0 insertions(+), 25 deletions(-)

commit 0b5d0c5b3bccbd39cd4741eb28a3e6c27a8aaf14
Author: Alexander Shopov <ash@kambanaria.org>
Date:   Sun Oct 14 20:27:29 2012 +0300

    Updated Bulgarian translation

 po/bg.po |  469 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 248 insertions(+), 221 deletions(-)

commit 15fdcd8932b4c56071ac0a0fc8493c73d195fbbc
Author: Xan Lopez <xan@igalia.com>
Date:   Sun Oct 7 14:35:19 2012 -0400

    ephy-window: use 'Bookmarks' in here
    
    It will collide with the existing "Bookmarks" item, but 3.6 is string
    frozen so that's the best we can do. I think people not using GNOME
    will prefer this to the old menubar thing anyway.

 src/ephy-window.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 9faafcfd15c4ea8adbb9178b321db4a5a6f0dc8e
Author: Carlos Garcia Campos <cgarcia@igalia.com>
Date:   Thu Sep 27 10:15:15 2012 +0200

    Make sure windows are properly closed when quitting from the shell menu
    
    https://bugzilla.gnome.org/show_bug.cgi?id=679844
    
    Conflicts:
    
    	src/ephy-shell.c
    
    We need this for the gear menu changes to build.

 doc/reference/epiphany-sections.txt |    1 +
 src/ephy-session.c                  |   37 +++++++++
 src/ephy-session.h                  |    2 +
 src/ephy-window.c                   |  140 ++++++++++++++++++++---------------
 src/ephy-window.h                   |    2 +
 5 files changed, 121 insertions(+), 61 deletions(-)

commit 486765172d389e432d84560f658b0f4d023f4048
Author: Xan Lopez <xan@igalia.com>
Date:   Sun Oct 7 14:29:22 2012 -0400

    Add 'History' item to the gear menu when not in the Shell

 src/ephy-window.c             |    4 ++--
 src/resources/epiphany-ui.xml |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 7ca57788b4eea72a1f2a19880e022f9c92faa60a
Author: Andika Triwidada <andika@gmail.com>
Date:   Mon Oct 8 00:24:20 2012 +0700

    Updated Indonesian translation

 po/id.po |  295 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 152 insertions(+), 143 deletions(-)

commit 7a0b609ba22d6f80d80e80550468feb9242468ff
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Sun Oct 7 18:25:43 2012 +0200

    Updated Slovenian translation

 po/sl.po |  220 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 118 insertions(+), 102 deletions(-)

commit bdc085484ecc5cc3e0677e7a5126d1174f03bd62
Author: Xan Lopez <xan@igalia.com>
Date:   Sun Oct 7 10:44:51 2012 -0400

    ephy-window: add F10 accel for super menu
    
    Same as Files.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=673878

 src/ephy-window.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 03c0677e0fe78d7a398bec28c9b5a5031b134f9c
Author: Xan Lopez <xan@igalia.com>
Date:   Sun Oct 7 10:37:57 2012 -0400

    Merge the app menu into the gear menu when we are not in the Shell
    
    Gets rid of the ugly menubar with a single menu.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=673054

 src/ephy-shell.c              |   35 ++++-------------------
 src/ephy-window.c             |   63 +++++++++++++++++++++++++++++++++++++++++
 src/resources/epiphany-ui.xml |    7 ++++-
 src/window-commands.c         |   63 +++++++++++++++++++++++++++++++++++++++++
 src/window-commands.h         |   12 ++++++++
 5 files changed, 150 insertions(+), 30 deletions(-)

commit c85e454e7472a23f10f02f04071f13120882363c
Author: Alexandre Franke <alexandre.franke@gmail.com>
Date:   Thu Oct 4 11:27:39 2012 +0200

    Update French translation

 po/fr.po |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

commit 8b19a6fbea87a1fbaf4de568b5ccbcd5362cb6b8
Author: Stefano Facchini <stefano.facchini@gmail.com>
Date:   Thu Sep 6 23:15:08 2012 +0200

    ephy-profile-utils: don't replace environment when spwaning ephy-profile-migrator
    
    Instead, just append the new variable to the existing environment.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=683538

 lib/ephy-profile-utils.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

commit 857b10c70d38103ba9643e681307a02fd176b35e
Author: Bastien Nocera <hadess@hadess.net>
Date:   Thu May 17 15:03:34 2012 +0100

    pdm-dialog: Add type-ahead search to personal data
    
    The password treeview is unusable to find old passwords or cookies,
    as some are prefixed by "http://", and others will have different
    vhost names.
    
    The search function will look first for sub-string matches in the
    URIs, then in the usernames (or cookie names).
    
    https://bugzilla.gnome.org/show_bug.cgi?id=676240

 src/pdm-dialog.c |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)