Merge branch 'upstream-unstable'

ChangeLog

@@ -1,6 +1,7 @@
 This file is licensed under the terms of the expat license, see the file EXPAT.
 
-v0.3.1
+v0.3.2
+ + Fix opening address with Go button
  + Fix automigration of existing bookmarks
  + Fix crash on opening autocompletion
  + Fix adblock handling of frames

midori/midori-browser.c

@@ -3597,7 +3597,10 @@ _action_location_secondary_icon_released (GtkAction*     action,
             }
         }
         else if (gtk_window_get_focus (GTK_WINDOW (browser)) == widget)
-            _action_location_submit_uri (action, uri, FALSE, browser);
+        {
+            const gchar* text = gtk_entry_get_text (GTK_ENTRY (widget));
+            _action_location_submit_uri (action, text, FALSE, browser);
+        }
         else if ((feed = g_object_get_data (G_OBJECT (view), "news-feeds")))
         {
             KatzeArray* news_feeds;

wscript

@@ -29,7 +29,7 @@ from Configure import find_program_impl
 
 major = 0
 minor = 3
-micro = 1
+micro = 2
 
 APPNAME = 'midori'
 VERSION = str (major) + '.' + str (minor) + '.' + str (micro)