Upgrade to ES 0.20.0.RC1
Update grok pattern
Merge remote-tracking branch 'upstream/master'
Make the apache pattern tolerating spaces at the end of the request url
Fix the patch for unzipped invocation
Upgrade to Jruby 1.7.1
Merge remote-tracking branch 'upstream/master'
Upgrade to ES 0.20.1
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Makefile
Disable the SIGHUP handler to avoid problems for elastic search output
Merge remote-tracking branch 'upstream/master'
Delete the generated file
Merge remote-tracking branch 'upstream/master'
Fix the relative path to grok patterns
Add the script to deploy logstash
Fix missing $ in Makefile
Update the ES download URL
Upgrade to ES 0.20.2
Fix the jar url
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Makefile
	lib/logstash/config/grammar.rb
	lib/logstash/filters/geoip.rb