]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into gsmopen01
authorGiovanni Maruzzelli <gmaruzz@gmail.com>
Fri, 6 Apr 2012 18:17:54 +0000 (20:17 +0200)
committerGiovanni Maruzzelli <gmaruzz@gmail.com>
Fri, 6 Apr 2012 18:17:54 +0000 (20:17 +0200)

Trivial merge