Merged revisions 377214 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Tue, 4 Dec 2012 23:19:30 +0000 (23:19 +0000)
committerAutomerge script <automerge@asterisk.org>
Tue, 4 Dec 2012 23:19:30 +0000 (23:19 +0000)
commit4acb2070f21883d1da40322df6b5d18fd727f5a6
tree9d1a9e3e7716774ce5b8f11976f000f24c6770b7
parent2158005bdb7e4822497ae1ccd50adc1da9a3410b
Merged revisions 377214 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk

................
  r377214 | rmudgett | 2012-12-04 16:34:05 -0600 (Tue, 04 Dec 2012) | 8 lines

  confbridge: Update online XML documentation.
  ........

  Merged revisions 377212 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........

  Merged revisions 377213 from http://svn.asterisk.org/svn/asterisk/branches/11
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377220 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_confbridge.c