]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'v1.2.stable' of ssh://git.freeswitch.org:222/freeswitch into v1.2.stable
authorJeff Lenk <jeff@jefflenk.com>
Tue, 4 Mar 2014 03:11:23 +0000 (21:11 -0600)
committerJeff Lenk <jeff@jefflenk.com>
Tue, 4 Mar 2014 03:11:23 +0000 (21:11 -0600)

Trivial merge