]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
projects / thirdparty / asterisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4a5669 a280400)
Merge "test_time: Provide a timeout when waiting." into 13
authorJoshua Colp <jcolp@digium.com>
Mon, 28 Dec 2015 22:06:54 +0000 (16:06 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 28 Dec 2015 22:06:55 +0000 (16:06 -0600)

Trivial merge
Mirror of https://github.com/asterisk/asterisk.git