Update geoip6 to the June 4 2014 database.
Update geoip to the June 4 2014 database.
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Merge remote-tracking branch 'karsten/geoip6-jun2014' into maint-0.2.4
Fix changes file for geoip
Merge remote-tracking branch 'origin/maint-0.2.4'