Merged revisions 283627 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Thu, 26 Aug 2010 12:26:46 +0000 (12:26 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 26 Aug 2010 12:26:46 +0000 (12:26 +0000)
commitc48c7123c17b5445caecd556b7604a349afde1b2
treeb3160252f305900d34ec8514f8eabcc239e927b9
parent75232687f4f1a8c09a2560235cebf4792969a500
Merged revisions 283627 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r283627 | russell | 2010-08-26 07:26:22 -0500 (Thu, 26 Aug 2010) | 2 lines

  Move httptimeout out from in between port and bindaddr.
........

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