unset collect_file_and_line (#205)
unset collect_file_and_line (#205)

Conflicts:

	lib/logstash/outputs/gelf.rb

joekiller/logstash-kafka,Aloomaio/logstash-kafka,opentable/logstash-kafka,tinglinux/logstash-kafka,tinglinux/logstash-kafka,opentable/logstash-kafka,joekiller/logstash-kafka,Aloomaio/logstash-kafka