842917dea0cfdf70f158a312cc1f77f769791d8c 99930d499e424f4560b371412e05d10476216ece Jeremy Kemper jeremy@bitsweat.net http://github.com/rails/rails/commit/636e6b7138864ceb1e309939cd879e710b287f3e 636e6b7138864ceb1e309939cd879e710b287f3e 2008-07-17T11:52:56-07:00 2008-07-17T11:52:56-07:00 Merge branch 'master' into i18n-merge Conflicts: actionpack/lib/action_view/helpers/form_options_helper.rb activerecord/lib/active_record/validations.rb 2a36dfef02f706302a20bb5b2d428b32e9af97f0 Jeremy Kemper jeremy@bitsweat.net