fix extra words in man page
Update geoip to the August 7 2014 database.
Update geoip6 to the August 7 2014 database.
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Merge remote-tracking branch 'karsten/geoip6-aug2014' into maint-0.2.4
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5