From: Joshua Colp <jcolp@digium.com>
Date: Fri, 24 Mar 2017 22:46:29 +0000 (-0500)
Subject: Merge "res_xmpp: Correct implementation of JABBER_STATUS & JabberStatus" into 14
X-Git-Tag: 14.5.0-rc1~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b40e2d00e51c6f0c75ea1b46fa399fbb71b6ddb;p=thirdparty%2Fasterisk.git

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

6b40e2d00e51c6f0c75ea1b46fa399fbb71b6ddb