Merged revisions 291940 via svnmerge from
authorPaul Belanger <paul.belanger@polybeacon.com>
Fri, 15 Oct 2010 19:53:06 +0000 (19:53 +0000)
committerPaul Belanger <paul.belanger@polybeacon.com>
Fri, 15 Oct 2010 19:53:06 +0000 (19:53 +0000)
commit5c695396a7c5e4e0b63d12a2c91d83823333142b
tree2581f80136388cd947a5124404089fc8b3d61ebe
parent45fb4df2886efebced41fd9dfd1249daca71159f
Merged revisions 291940 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r291940 | pabelanger | 2010-10-15 15:50:22 -0400 (Fri, 15 Oct 2010) | 16 lines

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

  ................
    r291939 | pabelanger | 2010-10-15 15:35:20 -0400 (Fri, 15 Oct 2010) | 9 lines

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

    ........
      r291938 | pabelanger | 2010-10-15 15:30:41 -0400 (Fri, 15 Oct 2010) | 2 lines

      Clean up formatting.
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@291941 65c4cc65-6c06-0410-ace0-fbb531ad65f3
configs/gtalk.conf.sample