]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
FS-5849 --resolve
authorAnthony Minessale <anthm@freeswitch.org>
Tue, 8 Oct 2013 16:57:12 +0000 (21:57 +0500)
committerAnthony Minessale <anthm@freeswitch.org>
Tue, 8 Oct 2013 16:09:04 +0000 (11:09 -0500)
commit6e6a77fa86c97499eddda9d9ce2879c5711ef133
tree96f0e5471599b334adafcec94af536290190e1ca
parentb5ca53f2f9cce0b84a07559b57504e399f9bec87
FS-5849 --resolve

Conflicts:
src/mod/applications/mod_conference/mod_conference.c
src/mod/applications/mod_conference/mod_conference.c