]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f35dc58 edfb1e9)
Merge branch 'master' into smgmaster
authorKonrad Hammel <konrad@sangoma.com>
Fri, 11 Feb 2011 16:15:37 +0000 (11:15 -0500)
committerKonrad Hammel <konrad@sangoma.com>
Fri, 11 Feb 2011 16:15:37 +0000 (11:15 -0500)

Trivial merge
Mirror of https://github.com/signalwire/freeswitch.git