Merge "Resolve race conditions involving Stasis bridges."
authorMatt Jordan <mjordan@digium.com>
Fri, 19 Jun 2015 15:11:36 +0000 (10:11 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 19 Jun 2015 15:11:36 +0000 (10:11 -0500)

Trivial merge