[DRE-commits] [SCM] ruby-merb-core.git branch, master, updated. upstream/1.1.3-4-gf6dbc64

[Tollef Fog Heen]

The following commit has been merged in the master branch:
commit 585f83df09bcfe9339ca63ba18b9fc9dcecdf993
Author: Tollef Fog Heen <tfheen at debian.org>
Date:   Sat Apr 21 21:07:37 2012 +0200

    Add overrides for require rubygems

diff --git a/debian/require-rubygems.overrides b/debian/require-rubygems.overrides
new file mode 100644
index 0000000..942c067
--- /dev/null
+++ b/debian/require-rubygems.overrides
@@ -0,0 +1,4 @@
+---
+- debian/ruby-merb-core/usr/lib/ruby/vendor_ruby/merb-core/test/helpers/multipart_request_helper.rb
+- debian/ruby-merb-core/usr/lib/ruby/vendor_ruby/merb-core/test/run_spec.rb
+- debian/ruby-merb-core/usr/lib/ruby/vendor_ruby/merb-core/gem_ext/gem_dependency.rb

-- 
ruby-merb-core.git