Merged revisions 329950 via svnmerge from
authorSean Bright <sean@malleable.com>
Thu, 28 Jul 2011 12:44:51 +0000 (12:44 +0000)
committerSean Bright <sean@malleable.com>
Thu, 28 Jul 2011 12:44:51 +0000 (12:44 +0000)
commitd4e239fa603c7521c76dc83e2e3a4379caaafb8f
tree86e4949114395f2c8ac1c436d5c4a164ce940028
parent73462b32dd20a190ed8a4245ec035270b423aa6e
Merged revisions 329950 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r329950 | seanbright | 2011-07-28 08:43:55 -0400 (Thu, 28 Jul 2011) | 1 line

  Correct the spelling of 'conference.'
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329951 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_confbridge.c