]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res/res_corosync: Always decline module load, instead of failing" into 13
authorMatt Jordan <mjordan@digium.com>
Mon, 29 Jun 2015 16:16:01 +0000 (11:16 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 29 Jun 2015 16:16:01 +0000 (11:16 -0500)

Trivial merge