]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch
authorMichael S Collins <msc@freeswitch.org>
Sat, 21 Jan 2012 00:23:49 +0000 (16:23 -0800)
committerMichael S Collins <msc@freeswitch.org>
Sat, 21 Jan 2012 00:23:49 +0000 (16:23 -0800)

Trivial merge