]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "core: Add PARSE_TIMELEN support to ast_parse_arg and ACO." into 14
authorJoshua Colp <jcolp@digium.com>
Wed, 19 Jul 2017 14:22:48 +0000 (09:22 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 19 Jul 2017 14:22:48 +0000 (09:22 -0500)

Trivial merge