]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge pull request #134 in FS/freeswitch from ~PAUL.ARNOLD/freeswitch-fs-7051:master...
authorBrian West <brian@freeswitch.org>
Fri, 5 Dec 2014 13:54:56 +0000 (07:54 -0600)
committerBrian West <brian@freeswitch.org>
Fri, 5 Dec 2014 13:54:56 +0000 (07:54 -0600)
* commit '843e4953be26f028d177d72aa0f5ea2d624e2cbf':
  FS-7051: Preserve the annexb=no/yes status


Trivial merge