Merged revisions 289718 via svnmerge from
authorPaul Belanger <paul.belanger@polybeacon.com>
Fri, 1 Oct 2010 17:22:30 +0000 (17:22 +0000)
committerPaul Belanger <paul.belanger@polybeacon.com>
Fri, 1 Oct 2010 17:22:30 +0000 (17:22 +0000)
commit1517166700ac4c7a27097578a41a0d944d405098
treecc6ecdd734b75de9697de6c2f2ca43a1de1f782f
parentbb485fc6f91441550410de2ee5f42c58e5ed539c
Merged revisions 289718 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r289718 | pabelanger | 2010-10-01 13:19:49 -0400 (Fri, 01 Oct 2010) | 20 lines

  Merged revisions 289704 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r289704 | pabelanger | 2010-10-01 13:09:03 -0400 (Fri, 01 Oct 2010) | 13 lines

    Merged revisions 289703 via svnmerge from
    https://origsvn.digium.com/svn/asterisk/branches/1.4

    ........
      r289703 | pabelanger | 2010-10-01 13:03:11 -0400 (Fri, 01 Oct 2010) | 6 lines

      Disable debugging by default

      and reformat .config file.

      Review: https://reviewboard.asterisk.org/r/929/
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@289732 65c4cc65-6c06-0410-ace0-fbb531ad65f3
configs/jabber.conf.sample
res/res_jabber.c