]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of ssh://git.freeswitch.org/freeswitch
authorMarc Olivier Chouinard <mochouinard@moctel.com>
Fri, 13 Aug 2010 23:17:36 +0000 (19:17 -0400)
committerMarc Olivier Chouinard <mochouinard@moctel.com>
Fri, 13 Aug 2010 23:17:36 +0000 (19:17 -0400)

Trivial merge