Merge branch 'master' into active_model

Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb

1 files changed, 17 insertions, 0 deletions

diff --git a/activesupport/lib/active_support/dependency_module.rb b/activesupport/lib/active_support/dependency_module.rb
new file mode 100644
index 0000000000..6847c0f86a
--- /dev/null
+++ b/activesupport/lib/active_support/dependency_module.rb
@@ -0,0 +1,17 @@
+module ActiveSupport
+  module DependencyModule
+    def append_features(base)
+      return false if base < self
+      (@_dependencies ||= []).each { |dep| base.send(:include, dep) }
+      super
+    end
+
+    def depends_on(*mods)
+      mods.each do |mod|
+        next if self < mod
+        @_dependencies ||= []
+        @_dependencies << mod
+      end
+    end
+  end
+end