Merge branch 'develop' into xapian-dcabo

Conflicts:
	spec/models/xapian_spec.rb

1 files changed, 39 insertions, 0 deletions

diff --git a/vendor/gems/rdoc-2.4.3/lib/rdoc/include.rb b/vendor/gems/rdoc-2.4.3/lib/rdoc/include.rb
new file mode 100644
index 000000000..9be906158
--- /dev/null
+++ b/vendor/gems/rdoc-2.4.3/lib/rdoc/include.rb
@@ -0,0 +1,39 @@
+require 'rdoc/code_object'
+
+##
+# A Module include in a class with \#include
+
+class RDoc::Include < RDoc::CodeObject
+
+  ##
+  # Name of included module
+
+  attr_accessor :name
+
+  ##
+  # Creates a new Include for +name+ with +comment+
+
+  def initialize(name, comment)
+    super()
+    @name = name
+    self.comment = comment
+  end
+
+  def inspect # :nodoc:
+    "#<%s:0x%x %s.include %s>" % [
+      self.class,
+      object_id,
+      parent_name, @name,
+    ]
+  end
+
+  ##
+  # Attempts to locate the included module object.  Returns the name if not
+  # known.
+
+  def module
+    RDoc::TopLevel.find_module_named(@name) || @name
+  end
+
+end
+