Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

2013-10-11 11:16:45 -04:00 · 2013-10-11 11:16:45 -04:00 · 82d8944928
parent 004a9c6dd1 3b0265198f
commit 82d8944928
2 changed files with 1245 additions and 777 deletions
--- a/changes/geoip-october2013
+++ b/changes/geoip-october2013
@ -0,0 +1,3 @@
+  o Minor features:
+    - Update to the October 2 2013 Maxmind GeoLite Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip