]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
Fixed conflict from previous merge
authorDavid Yat Sin <dyatsin@sangoma.com>
Wed, 25 Jul 2012 15:27:01 +0000 (11:27 -0400)
committerDavid Yat Sin <dyatsin@sangoma.com>
Wed, 25 Jul 2012 15:27:01 +0000 (11:27 -0400)
commit4585dbffbbdd210cbe5c56a1f90a5236cc50a042
tree2d75015bcbb2c00ec86018ebf8d385373e1d4764
parent8b0fbe605c35c2c1e8f1afd4962fe9cce008bc5c
Fixed conflict from previous merge
conf/vanilla/autoload_configs/modules.conf.xml