Merged revisions 290674 via svnmerge from
authorDavid Vossel <dvossel@digium.com>
Wed, 6 Oct 2010 21:23:29 +0000 (21:23 +0000)
committerDavid Vossel <dvossel@digium.com>
Wed, 6 Oct 2010 21:23:29 +0000 (21:23 +0000)
commitc6f89f7ca3eaa751e66da598331a4b60500d16dc
tree5bee325e742ae52837bf43937e5235a73f1e5458
parent3a986a75c1ce08e2ff0bcea20d42a213db934391
Merged revisions 290674 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r290674 | dvossel | 2010-10-06 16:22:51 -0500 (Wed, 06 Oct 2010) | 4 lines

  Fixes commented out code to use #if 0 instead.

  Thanks to rmudgett for catching this!
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@290677 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_gtalk.c