Merge branch 'testing' into stable

extra/template.conf

@@ -97,6 +97,8 @@
 						-- format: '[|ipv4|ipv6] "hostname-or-ip-address" port 10000'
 						remotes = {
 							'"gw01.ffho.net" port 100%ID',
+							'ipv6 "2001:830:c:9::12" port 100%ID',
+							'ipv4 "80.242.130.70" port 100%ID',
 						},
 					},
 					gw02 = {

modules

@@ -1,5 +1,5 @@
 GLUON_SITE_FEEDS='ffho'
 
-PACKAGES_FFHO_REPO=http://git.c3pb.de/freifunk-pb/ffho-packages.git
+PACKAGES_FFHO_REPO=https://git.ffho.net/FreifunkHochstift/ffho-packages.git
 PACKAGES_FFHO_BRANCH=v2016.2.x
-PACKAGES_FFHO_COMMIT=33f44ef1cae86899f30614f69e10b692c82e4545
+PACKAGES_FFHO_COMMIT=72ba236324fb538dc304695285fae059489365b9