Merge "res/res_stasis_device_state: Allow for subscribing to 'all' device state"
authorMatt Jordan <mjordan@digium.com>
Wed, 23 Sep 2015 17:56:31 +0000 (12:56 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 23 Sep 2015 17:56:32 +0000 (12:56 -0500)

Trivial merge