Merged revisions 336441 via svnmerge from
authorOlle Johansson <oej@edvina.net>
Mon, 19 Sep 2011 12:20:44 +0000 (12:20 +0000)
committerOlle Johansson <oej@edvina.net>
Mon, 19 Sep 2011 12:20:44 +0000 (12:20 +0000)
commitcab155e437ed7563d55262f6440c5a18cf80d9c6
tree2d79339ab415ee2c96b1e3e8d9757cd6f96c3e14
parent5b4b76d3aac25dad2f5fa4e5da7a18b668c59a26
Merged revisions 336441 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r336441 | oej | 2011-09-19 14:15:06 +0200 (Mån, 19 Sep 2011) | 9 lines

  Merged revisions 336440 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r336440 | oej | 2011-09-19 14:06:48 +0200 (Mån, 19 Sep 2011) | 2 lines

    Make sure manager_debug option is reset at reload
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336453 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/manager.c