]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into smgmaster
authorKonrad Hammel <konrad@sangoma.com>
Mon, 18 Oct 2010 19:08:03 +0000 (15:08 -0400)
committerKonrad Hammel <konrad@sangoma.com>
Mon, 18 Oct 2010 19:08:03 +0000 (15:08 -0400)

Trivial merge