emberjs/ember.js — pull request #1913 by lcoq (2013-01-29 10:33:02+00:00)
Title: Ember.Route#setupController set `this.controller` if defined

The PR for the issue #1905.

I did not create a new test for this, as I believe the test where I put the assertion seems to correspond almost well to this feature.

Please let me know if I made something wrong