]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into smgmaster
authorKonrad Hammel <konrad@sangoma.com>
Wed, 9 Feb 2011 20:20:55 +0000 (15:20 -0500)
committerKonrad Hammel <konrad@sangoma.com>
Wed, 9 Feb 2011 20:20:55 +0000 (15:20 -0500)

Trivial merge