<NME> .gitignore
<BEF> .*.swp
*.gem
local

*.class
.rbx
.rbx
*.tar.gz
*.jar
.bundle
build
local
test/setup/elasticsearch/elasticsearch-*
vendor
.sass-cache
data
.buildpath
.project
.DS_Store
*.pyc
etc/jira-output.conf
coverage/*
sample-*.conf
.VERSION.mk

<MSG> Merge branch 'master' into experimental/petef-jruby

<DFF> @@ -1,4 +1,4 @@
 .*.swp
 *.gem
 local
-
+test/setup

Merge branch 'master' into experimental/petef-jruby