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

Trivial merge