]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into smgmaster
authorKonrad Hammel <konrad@sangoma.com>
Sat, 30 Oct 2010 00:18:07 +0000 (20:18 -0400)
committerKonrad Hammel <konrad@sangoma.com>
Sat, 30 Oct 2010 00:18:07 +0000 (20:18 -0400)

Trivial merge