Merge branch 'maint-0.2.1' into release-0.2.1

2011-05-10 23:05:03 -04:00 · 2011-05-10 23:05:03 -04:00 · c783b828ca
parent b36a837f08 e7b10e5ecf
commit c783b828ca
2 changed files with 4392 additions and 2090 deletions
--- a/changes/geoip-may2011
+++ b/changes/geoip-may2011
@ -0,0 +1,3 @@
+  o Minor features:
+    - Update to the May 1 2011 Maxmind GeoLite Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip