From: Joshua Colp <jcolp@digium.com>
Date: Tue, 17 Nov 2015 14:12:26 +0000 (-0600)
Subject: Merge "Confbridge: Add a user timeout option"
X-Git-Tag: 14.0.0-beta1~576
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e18b07da9d9b13a21eb93dfbbebfc0b2b18128d1;p=thirdparty%2Fasterisk.git

Merge "Confbridge: Add a user timeout option"
---

e18b07da9d9b13a21eb93dfbbebfc0b2b18128d1