Merge "main/devicestate: Prevent duplicate registration of device state providers"
authorMatt Jordan <mjordan@digium.com>
Sat, 11 Jul 2015 16:04:26 +0000 (11:04 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Sat, 11 Jul 2015 16:04:26 +0000 (11:04 -0500)

Trivial merge