Merged revisions 291194 via svnmerge from
authorDavid Vossel <dvossel@digium.com>
Mon, 11 Oct 2010 21:44:34 +0000 (21:44 +0000)
committerDavid Vossel <dvossel@digium.com>
Mon, 11 Oct 2010 21:44:34 +0000 (21:44 +0000)
commit3e6c19a83720785f6305270d3288478d78d8bcd5
treeac556918d14fe2daa3f067519d3a7e018193a2a1
parent0736871cc67ba6c234bfefc6d87a567ad48df510
Merged revisions 291194 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r291194 | dvossel | 2010-10-11 16:44:04 -0500 (Mon, 11 Oct 2010) | 2 lines

  Update CHANGES to reflect new gtalk.conf options.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@291195 65c4cc65-6c06-0410-ace0-fbb531ad65f3
CHANGES