From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Mon, 22 Aug 2016 19:22:08 +0000 (+0200)
Subject: Merge remote-tracking branch 'processone/pr/1261'
X-Git-Tag: 16.09~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1bfa1c613b75a0aeeb7d0283ddfcc0711997a4d8;p=ejabberd

Merge remote-tracking branch 'processone/pr/1261'

* processone/pr/1261:
  Fixed #1260 Stream Management feature for the websocket connections
---

1bfa1c613b75a0aeeb7d0283ddfcc0711997a4d8