commit 47a5f73cab9f78af6c90172e12c8a542207bb697
Author: Xan Lopez <xan@gnome.org>
Date:   Mon Dec 20 22:20:11 2010 +0100

    The Soviet government has fallen!

 src/window-commands.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

commit 24c6c1492ad58220707dce4a076a619743669589
Author: Mattias Põldaru <mahfiaz gmail com>
Date:   Mon Dec 20 14:17:46 2010 +0200

    [l10n] Updated Estonian translation

 po/et.po |  987 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 519 insertions(+), 468 deletions(-)

commit 5a4853c420f53929340b1948bbdab0156726c015
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Thu Dec 16 14:44:40 2010 -0500

    tests: clean up filenames
    
    Make filenames readable and tab-completion friendly.

 .gitignore                    |   10 +-
 tests/Makefile.am             |   30 ++--
 tests/ephy-embed-persist.c    |  315 +++++++++++++++++++++++++++++++++++++++++
 tests/ephy-embed-single.c     |  125 ++++++++++++++++
 tests/ephy-location-entry.c   |  165 +++++++++++++++++++++
 tests/ephy-search-entry.c     |   74 ++++++++++
 tests/ephy-zoom-control.c     |   78 ++++++++++
 tests/testephyembedpersist.c  |  315 -----------------------------------------
 tests/testephyembedsingle.c   |  125 ----------------
 tests/testephylocationentry.c |  165 ---------------------
 tests/testephysearchentry.c   |   74 ----------
 tests/testephyzoomcontrol.c   |   78 ----------
 12 files changed, 777 insertions(+), 777 deletions(-)

commit 080071ac01b0304028dcbeebef07c151ef6b7247
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Fri Dec 17 13:23:17 2010 +0100

    Updated Norwegian bokmål translation

 po/nb.po |   59 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 31 insertions(+), 28 deletions(-)

commit e83ffcbfd4b18db6187fa7e2bd11940c3c451071
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Thu Dec 16 00:13:58 2010 -0500

    configure.ac: bump GTK+ version
    
    Required for GtkStyleContext API.

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

commit 2f1702c2bca9b9baa43a265686df6481be885ddb
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Wed Dec 15 21:59:28 2010 +0100

    Updated Spanish translation

 po/es.po |  115 +++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 66 insertions(+), 49 deletions(-)

commit 4be1b9c1a46ea8395128c948e661c7d331f7364a
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Wed Dec 15 10:37:05 2010 -0500

    ephy-extensions-manager: fix g_variant_builder usage
    
    g_variant_builder_end is not needed at all.
    
    Bug #636740

 src/ephy-extensions-manager.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

commit f6f31ff0994c0c35f60910369f06541930b58f01
Author: Yanko Kaneti <yaneti@declera.com>
Date:   Tue Nov 16 09:04:18 2010 +0200

    epiphany.convert: Fix cache-size schema location
    
    Bug #634969
    
    Signed-off-by: Diego Escalante Urrelo <descalante@igalia.com>

 data/epiphany.convert |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 43a776e85d1fd602ef28756da4a5cc6e4fed40f9
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Tue Nov 16 00:27:37 2010 -0500

    Port to gtk+ master's GtkStyleContext
    
    Updates all our uses of GtkStyle stuff to the newer GtkStyleContext API.
    ephy-web-view porting done by Matthias Clasen <mclasen@redhat.com>
    
    Bug #636501

 embed/ephy-web-view.c                |   40 ++++++++------
 lib/widgets/ephy-location-entry.c    |  100 ++++++++++++++++++----------------
 src/bookmarks/ephy-bookmark-action.c |    3 +-
 src/ephy-find-toolbar.c              |    4 +-
 src/ephy-notebook.c                  |   28 ++++++----
 5 files changed, 95 insertions(+), 80 deletions(-)

commit f6ffd608f887ede6e39d03aff38c6d43682fd231
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Tue Dec 14 14:53:56 2010 -0500

    egg: update from master
    
    Bug #636501

 lib/egg/egg-editable-toolbar.c |   27 +++++++++++++++++++++++++--
 lib/egg/egg-toolbar-editor.c   |    4 ++--
 lib/egg/egg-toolbars-model.c   |   18 ++++++++++++++++++
 lib/egg/update-from-egg.sh     |    2 +-
 4 files changed, 46 insertions(+), 5 deletions(-)

commit 534eae1b801c93950e2b664ffe772375d0fe2340
Author: Xan Lopez <xan@gnome.org>
Date:   Tue Dec 14 11:21:00 2010 +0100

    ephy-embed-single: move code from init to initialize

 embed/ephy-embed-single.c |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

commit a3df3eb66d73f5ae98f68a7f1ce8322f64269497
Author: Xan Lopez <xan@gnome.org>
Date:   Tue Dec 14 11:17:38 2010 +0100

    ephy-embed-single: couple of style fixes

 embed/ephy-embed-single.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit badfd49f16e581574e8da61e0b398b0bbe4f75a9
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Mon Dec 13 23:44:00 2010 +0200

    Updated Hebrew translation.

 po/he.po |   99 ++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 58 insertions(+), 41 deletions(-)

commit 67d0bb92493b5c0300dfe003376e29521c8298e1
Author: Xan Lopez <xan@gnome.org>
Date:   Mon Dec 13 00:54:15 2010 +0100

    ephy-embed-single: disable Flash by default
    
    The Adobe flash plugin uses GTK+2.x, so it cannot be loaded in our
    (GTK+3.x) process without causing a crash. Disable it by default until
    we implement a solution.

 embed/ephy-embed-single.c |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

commit df15ea85bdd3e545a78765c5ef3c249b4f4f3852
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Sun Dec 12 21:35:20 2010 +0100

    Updated Norwegian bokmål translation

 po/nb.po |  201 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 118 insertions(+), 83 deletions(-)

commit ecb009bea312f7a314cfa49af8277bd219e4258b
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Sun Dec 12 12:17:02 2010 +0100

    prefs-dialog: enhance Fonts tab layout
    
    We need labels next to the buttons or after setting a custom font you won't
    know what setting are you configuring.

 data/glade/prefs-dialog.ui |  267 +++++++++++++++++++++++++++++++-------------
 src/prefs-dialog.c         |    2 +-
 2 files changed, 188 insertions(+), 81 deletions(-)

commit 558def6efcafd1eb7320e0c260332230194eb7bf
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Sun Dec 12 12:06:33 2010 +0100

    prefs-dialog: fix General tab sizing

 data/glade/prefs-dialog.ui |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

commit 740a103119ad7b5494171e7135e15413d447aedc
Author: Xan Lopez <xan@gnome.org>
Date:   Sun Dec 12 00:58:53 2010 +0100

    ephy-web-view.c: fix typo

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

commit bcaf5480a8edb7f62273c735507ed31b339c3cd0
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Sat Dec 11 16:08:09 2010 +0100

    ephy-spell-check: remove unused files
    
    WebKitGTK+ implements this for us.
    
    Bug #637021

 lib/Makefile.am        |   13 ---
 lib/ephy-spell-check.c |  280 ------------------------------------------------
 lib/ephy-spell-check.h |   79 --------------
 3 files changed, 0 insertions(+), 372 deletions(-)

commit 270c17b0563fc3eaa3b728d2c20c6461a75e3888
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Sat Dec 11 16:39:23 2010 +0100

    Updated Spanish translation

 po/es.po | 1956 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 958 insertions(+), 998 deletions(-)

commit 2c864f4b14da98505d2ed294e2aa20a6dca8dd19
Author: Dan Winship <danw@gnome.org>
Date:   Sat Dec 11 16:05:54 2010 +0100

    .gitignore: add EphyEgg gir/typelib

 .gitignore |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit e4bd011e19c04b2ce174fc11e8da169c6fed2738
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Sat Dec 11 00:26:06 2010 +0200

    Updated Hebrew translation

 po/he.po |  203 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 117 insertions(+), 86 deletions(-)

commit 6f6728bed1acb6b2c516cbdc0be8370a7d11edbb
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Fri Dec 10 20:42:19 2010 +0100

    Updated Galician translations

 po/gl.po | 1975 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 961 insertions(+), 1014 deletions(-)

commit 50d90369fe5f6eece20890d5e53a1470fa6a4a3c
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Fri Dec 10 17:47:24 2010 +0100

    po: add ephy-profile-migrator to POTFILES

 po/POTFILES.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit e435a10d44dfed0705a5703b406c854a1208821e
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Tue Sep 1 00:05:36 2009 -0500

    ephy-web-view: use custom error pages
    
    Show nice error pages instead of WebKitGTK+'s defaults.
    
    Bug #592667

 configure.ac             |    1 +
 data/Makefile.am         |    2 +-
 data/pages/Makefile.am   |    6 ++
 data/pages/error.html    |   73 ++++++++++++++++++++++
 data/pages/recovery.html |   73 ++++++++++++++++++++++
 embed/ephy-web-view.c    |  150 ++++++++++++++++++++++++++++++++++++++++++----
 embed/ephy-web-view.h    |   10 +++
 lib/ephy-file-helpers.c  |    4 +-
 src/ephy-session.c       |   81 ++-----------------------
 9 files changed, 312 insertions(+), 88 deletions(-)

commit 3a1e97fbd04ca466535da01e8fdd0bca95560aa4
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date:   Thu Dec 9 20:02:25 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 2624 +++++++++++++++++----------------------------------------
 po/zh_TW.po | 2705 ++++++++++++++++++-----------------------------------------
 2 files changed, 1591 insertions(+), 3738 deletions(-)

commit 85c5fc195a1b422c0851eed651f54aa1f9fb22f9
Author: Xan Lopez <xan@gnome.org>
Date:   Thu Dec 9 10:41:15 2010 +0100

    prefs: remove broken preferences from UI
    
    Allow pages to use their own colors/fonts preferences have never
    really worked in WebKit. I'm not even sure we want this in the UI, but
    at the very least remove them until there's a setting in the engine to
    control this.

 data/glade/prefs-dialog.ui |   30 ------------------------------
 src/prefs-dialog.c         |    6 ------
 2 files changed, 0 insertions(+), 36 deletions(-)

commit 321749b5c05208f88922c2a6aca4b460a2a12459
Author: Xan Lopez <xan@gnome.org>
Date:   Thu Dec 9 10:27:33 2010 +0100

    Fix .gir generation for srcdir != builddir
    
    Add --includedir as needed. Diego, talk to me after class.

 src/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 9176664b703913181c002bbbdde575675bfd8559
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Wed Dec 8 16:32:25 2010 +0100

    ephy-web-view: make defines friendlier with introspection
    
    Non prefixed names trigger lots of warnings, avoid them.
    
    Bug #636790

 embed/ephy-web-view.c |    2 +-
 embed/ephy-web-view.h |    4 ++--
 src/ephy-window.c     |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

commit 62f2c31cefbd94e993584736fc82e33d4c62060b
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Wed Dec 8 15:35:56 2010 +0100

    ephy-permission-manager: fix names of permission types
    
    Prefix them with EPHY_PERMISSION_TYPE instead of "EPT_".
    
    Bug #636790

 embed/ephy-permission-manager.h |    6 +++---
 embed/ephy-web-view.c           |    6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

commit 576826ed720902bef4c2b916f5f973b967bbc59f
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Wed Dec 8 15:35:32 2010 +0100

    ephy-bookmarks: remove unused BOOKMARKS_HIERARCHY_SEP
    
    Bug #636790

 src/bookmarks/ephy-bookmarks.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

commit c4af85360754d6d8bfeba9dabe02593c639a1ae6
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Wed Dec 8 14:00:08 2010 +0100

    introspection: separate Egg into another gir file
    
    Don't mix up Epiphany and Egg prefixes into a single file. We now produce and
    install EphyEgg-version.gir and Epiphany-version.gir. Version being the
    Epiphany API version.
    
    Bug #636790

 src/Makefile.am |   36 ++++++++++++++++++++++++++++--------
 1 files changed, 28 insertions(+), 8 deletions(-)

commit 0256c457bc5558d97c98c17ee673923def23a85e
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Wed Dec 8 13:07:23 2010 +0100

    introspection: fix wrong and missing annotations
    
    Bug #636790

 embed/ephy-embed-container.c      |    2 +-
 embed/ephy-embed-shell.c          |   26 +++++++++++++++++++++-----
 embed/ephy-embed-shell.h          |    2 +-
 embed/ephy-embed-single.c         |   15 +++++++--------
 embed/ephy-favicon-cache.c        |    6 +++---
 embed/ephy-permission-manager.c   |    6 +++---
 embed/ephy-web-view.c             |    4 ++--
 lib/ephy-node.c                   |   31 +++++++++++++++++++++++++++++++
 lib/widgets/ephy-location-entry.c |   20 ++++++++++----------
 src/ephy-link.c                   |   23 +++++++++++++++++++++++
 src/ephy-toolbar.c                |    4 ++--
 11 files changed, 104 insertions(+), 35 deletions(-)

commit eb8fa514e6e3edb93be01d44ecc80608501979df
Author: Jonathon Jongsma <jonathon@quotidian.org>
Date:   Tue Dec 7 22:43:52 2010 -0600

    EphyLocationAction: fix potential leak
    
    Free the lock_stock_id before setting a new one.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=636742

 lib/widgets/ephy-location-entry.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 4015281028a036ee859360bb7feb3a6aeb8f56cb
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Tue Dec 7 19:51:11 2010 +0100

    prefs-dialog: new custom font selection UI
    
    Allow users to set custom sans, serif and monospace fonts if they don't want
    the defaults, which are the desktop wide settings in the
    org.gnome.desktop.interface schema.
    
    Bug #636761

 data/glade/prefs-dialog.ui             |   86 ++++++++++++++++++++++++-
 data/org.gnome.epiphany.gschema.xml.in |   20 ++++++
 embed/ephy-embed-prefs.c               |  107 +++++++++++++++++++++++++++++++-
 lib/ephy-prefs.h                       |    4 +
 src/prefs-dialog.c                     |   35 +++++++++--
 5 files changed, 240 insertions(+), 12 deletions(-)

commit bc03f56a7483e499274cf1632975dfbb7e09e9ec
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Tue Dec 7 18:47:06 2010 +0100

    ephy-embed-prefs: use minimum-font-size instead of minimum-logical-font-size
    
    minimum-logical-font-size doesn't works as expected by the UI.
    
    Bug #636761

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

commit 4a3836ec9150c5d82dc75db74f47daac5abde483
Author: Dan Winship <danw@gnome.org>
Date:   Wed Dec 8 12:36:50 2010 +0100

    .gitignore: add this

 .gitignore |   69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 69 insertions(+), 0 deletions(-)

commit c7a8b14f52d34f47c853b3c8cd2aa8588dbb5d93
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Tue Dec 7 19:47:37 2010 +0100

    ephy-file-helpers: prioritize uninstalled files
    
    This patch prioritizes uninstalled files so modified files in your epiphany
    checkout are used, avoiding the need to install them to see your changes.

 lib/ephy-file-helpers.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

commit 228139f5e379048a8ee4e7545b5361017402ffd2
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Tue Dec 7 19:02:52 2010 +0100

    data/glade: update orientation property of GtkBox widgets

 data/glade/certificate-dialogs.ui |   12 ++++++++++++
 data/glade/epiphany.ui            |    9 +++++++++
 data/glade/form-signing-dialog.ui |    6 +++++-
 data/glade/prefs-dialog.ui        |   26 ++++++++++++++++++++++----
 data/glade/print.ui               |    9 +++++++++
 5 files changed, 57 insertions(+), 5 deletions(-)

commit b695374f186d3942225bcc4434de033599f24fe8
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Tue Dec 7 18:43:47 2010 +0100

    ephy-embed-single: don't use macros when not needed
    
    We can use the arguments of the function safely.

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

commit c74c2ffafded21bc3b583743b7054de65f35eef5
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Tue Dec 7 15:59:47 2010 +0100

    ephy-embed-prefs: initialize prefs from settings
    
    Settings kept in sync with g_signal_connect were missing an initialization.

 embed/ephy-embed-prefs.c |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

commit 7a0f902ad4ab5c34d70897ac3e6cec59baf690ff
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Tue Dec 7 12:39:39 2010 +0100

    ephy-profile-utils: fix crasher when .migrated is unreadable
    
    When .gnome2/epiphany/.migrated file is unreadable we can hit a crasher due to
    sscanf. We now check for NULL before feeding sscanf.

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

commit 4a8a0f51849d8414cadfdeb5527820c4a689343a
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Mon Dec 6 20:49:27 2010 +0100

    ephy-profile-migration: separate migration code into another binary
    
    The migration code is now in the ephy-profile-migrator binary, this means:
     - epiphany is not linking to NSS anymore
     - lib/ephy-profile-migration.c was split into:
      + lib/ephy-profile-migrator.c: the new ephy-profile-migrator binary
      + lib/ephy-profile-utils.c: convenience _ephy_profile_*_form_auth_data functions.
     - testing for migration is done without running ephy-profile-migrator
    
    Bug #636685

 doc/reference/Makefile.am    |    5 -
 embed/ephy-embed-single.c    |    2 +-
 embed/ephy-web-view.c        |   36 ++--
 lib/Makefile.am              |   42 +++-
 lib/ephy-profile-migration.c |  586 ------------------------------------------
 lib/ephy-profile-migration.h |   45 ----
 lib/ephy-profile-migrator.c  |  470 +++++++++++++++++++++++++++++++++
 lib/ephy-profile-utils.c     |  186 +++++++++++++
 lib/ephy-profile-utils.h     |   49 ++++
 src/Makefile.am              |    4 -
 src/ephy-main.c              |   21 ++-
 tests/Makefile.am            |    7 -
 12 files changed, 774 insertions(+), 679 deletions(-)

commit e691b408355ec7789fe07c93f6c2376660c44486
Author: Sahran <sahran.ug@gmail.com>
Date:   Mon Dec 6 21:51:04 2010 +0100

    Added UG translation

 po/ug.po | 1014 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 539 insertions(+), 475 deletions(-)

commit f0e4768d336276334d7051ea9f6ee731b47c96b9
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Mon Dec 6 18:16:13 2010 +0100

    Updated Norwegian bokmål translation

 po/nb.po |  295 ++++++++++++++++++++++++++++---------------------------------
 1 files changed, 135 insertions(+), 160 deletions(-)

commit a7754510a01e60d856b20946e2a479b5cf149ff2
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Sat Nov 6 18:24:16 2010 -0500

    ephy-embed: clean up embed widget skeleton
    
    The inspector embedding breaks some assumptions about the internal embed
    widgetry, mainly breaking EPHY_GET_EMBED_FROM_EPHY_WEB_VIEW macro.
    The embed now has the main EphyWebView in a GtkPaned permanently.
    
    Bug #628459

 embed/ephy-embed-utils.h |    2 +-
 embed/ephy-embed.c       |  100 ++++++++++++++++-----------------------------
 2 files changed, 37 insertions(+), 65 deletions(-)

commit 5ca644b3023b74aff98995a2829cc7281088e756
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Mon Dec 6 14:36:12 2010 +0200

    Updated Hebrew translation.

 po/he.po | 1791 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 853 insertions(+), 938 deletions(-)

commit a200905ba8a0533cd8c81d06df980e2f4f480953
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Sat Sep 4 02:46:41 2010 +0300

    Updated Hebrew translation.

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

commit 5641c511a80969b910ba45897a2be3c411d40618
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Mon Dec 6 10:17:29 2010 +0100

    window-commands: hackfest mooded epiphany
    
    Party-approved-by: Comrade Xan

 src/window-commands.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

commit e8e388982b455411b17d6ee2bc187f64f70a1bea
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Mon Dec 6 10:14:25 2010 +0100

    window-commands: fix GtkAboutDialog property name

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

commit 4f15aa13172c3e2e0aca4b1fe031ce283702f882
Author: Diego Escalante Urrelo <descalante@igalia.com>
Date:   Mon Dec 6 10:00:00 2010 +0100

    Revert "Updated Russian translation from Yuri Myasoedov"
    
    This reverts commit 4289565b836e12d67449228ef6af4e6e031c54e8.
    
    This translation file is for Empathy, not Epiphany!

 po/ru.po | 5926 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 2979 insertions(+), 2947 deletions(-)

commit ef817ec85f6854a34dae62f977c834a2fe1d3c6e
Author: Alejandro G. Castro <alex@igalia.com>
Date:   Wed Dec 1 10:58:32 2010 +0100

    Handle all the different kind of errors in the load_error_cb callback
    and control they are caused by the main frame.
    
    Bug #623012

 embed/ephy-web-view.c |   73 ++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 57 insertions(+), 16 deletions(-)

commit 61394d5278c9d180e9adfee30633d31f08d5e6fb