]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge branch '13.13' of ssh://gerrit.asterisk.org:29418/asterisk into 13.13
authorKevin Harwell <kharwell@digium.com>
Tue, 22 Nov 2016 18:02:14 +0000 (12:02 -0600)
committerKevin Harwell <kharwell@digium.com>
Tue, 22 Nov 2016 18:02:14 +0000 (12:02 -0600)

Trivial merge