emberjs/ember.js — pull request #4851 by mixonic (2014-05-10 21:38:09+00:00)
Title: Document mergedProperties using QPN example. Fixes #4844

This documents `mergedProperties` in the same style as `concatenatedProperties`. I tried to write an example using actions, but it turns out the `_actions` stuff makes it confusing. Instead I propose using the new `queryParams` property as the example.

Fixes #4844, but maybe needs to block on QPN getting activated. Quick thoughts?