]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'v1.2.stable' of ssh://git.freeswitch.org:222/freeswitch into v1.2.stable
authorMichael S Collins <msc@freeswitch.org>
Tue, 23 Jul 2013 19:00:21 +0000 (12:00 -0700)
committerMichael S Collins <msc@freeswitch.org>
Tue, 23 Jul 2013 19:00:21 +0000 (12:00 -0700)

Trivial merge