From cde99b6f24aa8333be7a69e20a89b661d130644e Mon Sep 17 00:00:00 2001
From: Nick Hall <nick-h@gramps-project.org>
Date: Thu, 14 May 2015 18:54:11 +0100
Subject: [PATCH 1/2] Remove deprecated resize mode

---
 gramps/gui/glade/dbman.glade | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gramps/gui/glade/dbman.glade b/gramps/gui/glade/dbman.glade
index bd7815154..9ac96a1cf 100644
--- a/gramps/gui/glade/dbman.glade
+++ b/gramps/gui/glade/dbman.glade
@@ -54,8 +54,8 @@
               <object class="GtkLabel" id="label714">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes">Version description</property>
+                <property name="xalign">0</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -275,7 +275,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="margin_left">12</property>
-                <property name="resize_mode">immediate</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <property name="layout_style">start</property>

From b2606fb6d3f268faa0c7e6fa2496d94d9a383a76 Mon Sep 17 00:00:00 2001
From: Doug Blank <dblank@cs.brynmawr.edu>
Date: Thu, 14 May 2015 15:12:56 -0400
Subject: [PATCH 2/2] Gramps 4.2 addons URL from github

---
 gramps/gen/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gramps/gen/config.py b/gramps/gen/config.py
index 68d6352f9..a36413b71 100644
--- a/gramps/gen/config.py
+++ b/gramps/gen/config.py
@@ -150,7 +150,7 @@ register('behavior.surname-guessing', 0)
 register('behavior.use-tips', False)
 register('behavior.welcome', 100)
 register('behavior.web-search-url', 'http://google.com/#&q=%(text)s')
-register('behavior.addons-url', "http://svn.code.sf.net/p/gramps-addons/code/trunk/")
+register('behavior.addons-url', "https://raw.githubusercontent.com/gramps-project/addons/master/gramps42")
 
 register('export.proxy-order', [
         ["privacy", 0],