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

Trivial merge