From: zuul <zuul@gerrit.asterisk.org>
Date: Fri, 24 Mar 2017 17:25:07 +0000 (-0500)
Subject: Merge "res_xmpp: Correct implementation of JABBER_STATUS & JabberStatus"
X-Git-Tag: 15.0.0-beta1~242
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f27c1c7dc2318f57566c7cef9d701836c91fe437;p=thirdparty%2Fasterisk.git

Merge "res_xmpp: Correct implementation of JABBER_STATUS & JabberStatus"
---

f27c1c7dc2318f57566c7cef9d701836c91fe437