emberjs/ember-rails — pull request #162 by knewter (2013-03-25 23:25:10+00:00)
Title: Add note about updating ember from master

I saw #127 just needed a merge conflict fixed, so I did that and opened this PR with the merge fix. Is that helpful?