]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'v1.2.stable' of ssh://git.freeswitch.org:222/freeswitch into v1.2.stable
authorChris Rienzo <chris.rienzo@grasshopper.com>
Fri, 19 Apr 2013 01:31:52 +0000 (21:31 -0400)
committerChris Rienzo <chris.rienzo@grasshopper.com>
Fri, 19 Apr 2013 01:31:52 +0000 (21:31 -0400)

Trivial merge