From: Joshua Colp <jcolp@digium.com>
Date: Mon, 28 Dec 2015 22:34:32 +0000 (-0600)
Subject: Merge "test_time: Provide a timeout when waiting."
X-Git-Tag: 14.0.0-beta1~504
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=410c5ee0fc5f1ba8bc25ca6e2cdc11527f36b1b7;p=thirdparty%2Fasterisk.git

Merge "test_time: Provide a timeout when waiting."
---

410c5ee0fc5f1ba8bc25ca6e2cdc11527f36b1b7