bb518e192bf9bc5e30794767e7c5f04a277fb8d9
Merge branch 'master' of git://github.com/rails/rails into rails/master
7fcdf6c7d83ee65c3dc420284eb3b2c4f91a0255
Fixed has_many_through association join building for legacy dbs