7eb0cc533c406a66d704d1004f252b1530f75cf1
Merge branch 'master' of git://github.com/rails/rails
449755c35244f0b303e5db9cc7f295cd541ac203
merging rails
55701bcd6c12822bfa204a9f8234c91bf0931d2d
f152fdb403cf4ef399db3b1fb625511f96987946
07861ce34efba936a1d03b47689bbe3b6d8b6d15
Added support for nested conditions hashes to preload.
d69f3d7e22f915737aff9e694134956cceb828fa
added files to gitignore
9d8eaf0bfdea05364dd6a86bb782ad5610aade8b
Removed unecessary (at this time) method.
94128bf233617b2bc0a85cabe64fb2160a7bb752
Added a clean task to the Rakefile
3db806c7b1a6a562c4294f605d7ac6b95bd47ae3
Added Clean rake task.
7cd020d762cdb4bcb4aec7448ea63914d6523702
Resolved merge conflicts