]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into v1.2.stable
authorKen Rice <krice@freeswitch.org>
Fri, 29 Mar 2013 14:26:16 +0000 (09:26 -0500)
committerKen Rice <krice@freeswitch.org>
Fri, 29 Mar 2013 14:26:16 +0000 (09:26 -0500)

Trivial merge