Vijay Dev 03f8a57487 Merge branch 'master' of github.com:lifo/docrails ... Conflicts: activerecord/lib/active_record/core.rb		2012-05-17 17:49:33 +05:30
..
active_support	Merge branch 'master' of github.com:lifo/docrails	2012-05-17 17:49:33 +05:30
active_support.rb	Revert "Merge pull request #5864 from vatrai/remove_ordered_hash_autoload"	2012-04-17 06:31:44 -07:00