Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

2024-11-27 22:03:31 +01:00 · 2015-10-09 10:14:46 -04:00 · 2015-10-09 10:14:46 -04:00 · 552136668c
commit 552136668c
parent fb5a858a35 3569cffe14
3 changed files with 5447 additions and 2848 deletions
--- a/changes/geoip-october2015
+++ b/changes/geoip-october2015
@ -0,0 +1,3 @@
  o Minor features:
    - Update geoip and geoip6 to the October 9 2015 Maxmind GeoLite2 Country database.
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6
		`@ -0,0 +1,3 @@`
							`o Minor features:`
							`- Update geoip and geoip6 to the October 9 2015 Maxmind GeoLite2 Country database.`