Vijay Dev f938019da2 Merge branch 'master' of github.com:lifo/docrails ... Conflicts: activesupport/lib/active_support/core_ext/hash/slice.rb guides/source/active_support_core_extensions.md		2012-10-21 18:49:19 +05:30
..
active_model	Merge branch 'master' of github.com:lifo/docrails	2012-10-21 18:49:19 +05:30
active_model.rb	attr_accessible and attr_protected raise an exception pointing to use plugin or new protection model	2012-09-16 23:58:21 -05:00