]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch
authorMichael S Collins <msc@freeswitch.org>
Mon, 27 Aug 2012 22:50:01 +0000 (15:50 -0700)
committerMichael S Collins <msc@freeswitch.org>
Mon, 27 Aug 2012 22:50:01 +0000 (15:50 -0700)

Trivial merge