]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of git://git.freeswitch.org/freeswitch
authorEric des Courtis <eric.des.courtis@benbria.ca>
Tue, 25 May 2010 19:52:21 +0000 (15:52 -0400)
committerEric des Courtis <eric.des.courtis@benbria.ca>
Tue, 25 May 2010 19:52:21 +0000 (15:52 -0400)

Trivial merge