Merged revisions 307536 via svnmerge from
authorJason Parker <jparker@digium.com>
Thu, 10 Feb 2011 22:43:51 +0000 (22:43 +0000)
committerJason Parker <jparker@digium.com>
Thu, 10 Feb 2011 22:43:51 +0000 (22:43 +0000)
commit96cbd4ffcde2dba25d5e243100ed529dc320b5af
tree33eb9067fb3e02230932d05a2847a4f6c9b91e38
parent4cba13eb60ac976e545df8715183a44f911e712d
Merged revisions 307536 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r307536 | qwell | 2011-02-10 16:39:30 -0600 (Thu, 10 Feb 2011) | 22 lines

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

  ................
    r307535 | qwell | 2011-02-10 16:35:49 -0600 (Thu, 10 Feb 2011) | 15 lines

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

    ........
      r307534 | qwell | 2011-02-10 16:33:09 -0600 (Thu, 10 Feb 2011) | 8 lines

      Remove color when executing commands via a remote console.

      Essentially this makes '-x' imply '-n' on rasterisk.  This was done in a
      different and incomplete way previously, which I'm reverting here.

      (issue #18776)
      Reported by: alecdavis
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@307537 65c4cc65-6c06-0410-ace0-fbb531ad65f3
contrib/init.d/rc.debian.asterisk
main/asterisk.c