summaryrefslogtreecommitdiff
path: root/main/channel.c
diff options
context:
space:
mode:
authorJason Parker <jparker@digium.com>2011-03-02 19:54:43 +0000
committerJason Parker <jparker@digium.com>2011-03-02 19:54:43 +0000
commit070cb4ef871c40acc3f71a2a0415e0c381e1307d (patch)
tree0bd3a58043dbd092b37f03d53ffacb735178e2cb /main/channel.c
parentdc616cfe2cc0e7449b0462da17ce7ccaee344fd8 (diff)
Merged revisions 309256 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r309256 | qwell | 2011-03-02 13:54:20 -0600 (Wed, 02 Mar 2011) | 15 lines Merged revisions 309255 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r309255 | qwell | 2011-03-02 13:53:47 -0600 (Wed, 02 Mar 2011) | 8 lines Fix usage of "hasvoicemail=yes" and "mailbox=" in users.conf for SIP. Since it's a duplicate, nothing is going to be done, so delme doesn't need to be set at all. Strangely, when this was added, this was being set to 1 in 1.6, and 0 in trunk. (issue AST-439) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@309257 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/channel.c')
0 files changed, 0 insertions, 0 deletions