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

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

0843e6043e371a4fd8c4ac29f542a54df585f572