rails/rails — pull request #9899 by macksmind (2013-03-24 12:27:18+00:00)
Title: Backport #5808

df36c5f - Fix assert_template assertion with :layout option
4bd05a7 - Fix assert_template :layout => nil assertion
0d19a08 - Improve assert_template layout checking