rails/rails — comment on commit 0306f82e0c3cda3aad1b45eb0c3a359c254b62cc
File: railties/CHANGELOG.md line 3
By fxn:

Hahaha, conflict resolution sucking, fill fix :).