]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge pull request #224 in FS/freeswitch from ~WJ1918/freeswitch-fs-7383:master to...
authorMike Jerris <mike@jerris.com>
Mon, 23 Mar 2015 12:59:09 +0000 (07:59 -0500)
committerMike Jerris <mike@jerris.com>
Mon, 23 Mar 2015 12:59:09 +0000 (07:59 -0500)
* commit 'dee980d2ddf2afde01ab044b1285b05b6a085dba':
  FS-7383 #resolve


Trivial merge