]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of git.sangoma.com:smg_freeswitch into smgmaster
authorKonrad Hammel <konrad@sangoma.com>
Fri, 29 Oct 2010 19:01:20 +0000 (15:01 -0400)
committerKonrad Hammel <konrad@sangoma.com>
Fri, 29 Oct 2010 19:01:20 +0000 (15:01 -0400)

Trivial merge