d758d996d1b66e2a65640f79f01ce2ac674d7ed5 ca49299434bc764b667cd86846d892e91a150ef3 Pratik Naik pratiknaik@gmail.com http://github.com/lifo/docrails/commit/5f3f100ce2d689480da85abc88e5e940cf90189e 5f3f100ce2d689480da85abc88e5e940cf90189e 2009-04-22T07:26:03-07:00 2009-04-22T07:26:03-07:00 Merge branch 'master' into active_model Conflicts: activeresource/lib/active_resource/validations.rb 15c1a05a5308a9eea56d7f0889ac46d9cac5b57c Pratik Naik pratiknaik@gmail.com