]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch
authorChris Rienzo <chris.rienzo@grasshopper.com>
Fri, 10 Jan 2014 15:06:42 +0000 (10:06 -0500)
committerChris Rienzo <chris.rienzo@grasshopper.com>
Fri, 10 Jan 2014 15:06:42 +0000 (10:06 -0500)

Trivial merge