]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'v1.2.stable' of ssh://git.freeswitch.org:222/freeswitch into v1.2.stable
authorBrian West <brian@freeswitch.org>
Fri, 12 Jul 2013 18:03:46 +0000 (13:03 -0500)
committerBrian West <brian@freeswitch.org>
Fri, 12 Jul 2013 18:03:46 +0000 (13:03 -0500)

Trivial merge