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

2024-12-06 19:41:15 +01:00 · 2014-08-13 12:52:57 -04:00
parent bb68c731b8 fa7ce6d3be
commit 938deecc87
7 changed files with 4526 additions and 2724 deletions
@@ -0,0 +1,4 @@
+  o Documentation:
+    - Adjust the URLs in the README to refer to the new locations of
+      several documents on the website. Patch from Matt Pagan. Fixes
+      bug 12830.
@@ -0,0 +1,3 @@
+  o Minor features:
+    - Update geoip to the August 7 2014 Maxmind GeoLite2 Country database.
+
@@ -0,0 +1,3 @@
+  o Minor features:
+    - Update geoip6 to the August 7 2014 Maxmind GeoLite2 Country database.
+