Merge "res_xmpp: Does not connect in component mode"
authorJoshua Colp <jcolp@digium.com>
Thu, 4 Feb 2016 18:26:49 +0000 (12:26 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 4 Feb 2016 18:26:49 +0000 (12:26 -0600)

Trivial merge