]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of git.sangoma.com:smg_freeswitch
authorKonrad Hammel <konrad@sangoma.com>
Fri, 10 Dec 2010 21:55:32 +0000 (16:55 -0500)
committerKonrad Hammel <konrad@sangoma.com>
Fri, 10 Dec 2010 21:55:32 +0000 (16:55 -0500)

Trivial merge