<NME> registry.rb
<BEF> ADDFILE
<MSG> Merge remote branch 'origin/issue/17' into experimental/petef-jruby

Conflicts:
	lib/logstash/inputs/file.rb

<DFF> @@ -0,0 +1,12 @@
+require "logstash/namespace"
+
+# Global config registry.
+module LogStash::Config::Registry
+  @registry = Hash.new
+  class << self
+    attr_accessor :registry
+
+    # TODO(sissel): Add some helper methods here.
+  end
+end # module LogStash::Config::Registry
+  

Merge remote branch 'origin/issue/17' into experimental/petef-jruby