]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into smgmaster
authorKonrad Hammel <konrad@sangoma.com>
Thu, 10 Feb 2011 21:40:18 +0000 (16:40 -0500)
committerKonrad Hammel <konrad@sangoma.com>
Thu, 10 Feb 2011 21:40:18 +0000 (16:40 -0500)

Trivial merge