]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
projects / thirdparty / asterisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9cbd766 f58c0ac)
Merge "res/res_corosync: Always decline module load, instead of failing" into certifi...
authorJoshua Colp <jcolp@digium.com>
Tue, 30 Jun 2015 12:35:25 +0000 (07:35 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 30 Jun 2015 12:35:25 +0000 (07:35 -0500)

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