From: Joshua Colp <jcolp@digium.com>
Date: Mon, 28 Dec 2015 22:06:54 +0000 (-0600)
Subject: Merge "test_time: Provide a timeout when waiting." into 13
X-Git-Tag: 13.8.0-rc1~171
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47d508e9115042d93bf5a7dab025bceecaabd2e1;p=thirdparty%2Fasterisk.git

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

47d508e9115042d93bf5a7dab025bceecaabd2e1