- fix missing geoip (rolls back a previous accidental commit)
Merge git://github.com/logstash/logstash