72483c0d4c1e4ea794919974100acc2f255f6fd2 ea03b0885c110003496c1f99dc7d9d2f1534955b rick technoweenie@gmail.com http://github.com/rails/rails/commit/6a975d6ca28216cfa015374c802279349e9253ca 6a975d6ca28216cfa015374c802279349e9253ca 2008-05-31T17:15:24-07:00 2008-05-31T17:15:24-07:00 fix changelog conflict e0a73c68e00755993f2bac86115f178656637c93 rick technoweenie@gmail.com