rails/rails — pull request #9159 by lexmag (2013-02-02 21:44:16+00:00)
Title: Duplicate column_defaults properly

Backport c5176023a0585278c533610daf1eaf6ba7d19cd8 to fix #6115

Deleted:

activerecord/lib/active_record/core.rb

Conflicts:

activerecord/test/cases/base_test.rb