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

Merge "Confbridge: Add a user timeout option" into certified/13.1
---

89d40363ac3c5072baa5f1afbcc684eb6f1f49fd