Vijay Dev 3b7947ea31 Merge branch 'master' of github.com:lifo/docrails ... Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/configurable.rb activesupport/lib/active_support/core_ext/module/deprecation.rb guides/source/action_controller_overview.md guides/source/active_support_core_extensions.md guides/source/ajax_on_rails.textile guides/source/association_basics.textile guides/source/upgrading_ruby_on_rails.md While resolving conflicts, I have chosen to ignore changes done in docrails at some places - these will be most likely 1.9 hash syntax changes.		2012-09-21 22:49:20 +05:30
..
active_support	Merge branch 'master' of github.com:lifo/docrails	2012-09-21 22:49:20 +05:30
active_support.rb	Make ActiveSupport::Autoload local	2012-08-21 14:46:12 -03:00