Merged revisions 63286 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Mon, 7 May 2007 21:47:08 +0000 (21:47 +0000)
committerJoshua Colp <jcolp@digium.com>
Mon, 7 May 2007 21:47:08 +0000 (21:47 +0000)
commit5394364048dd8e530d5fd8ddbdd4c46729b7727c
tree2f5e2d2152ad75356911f6e76c4460d03da70d69
parentb6ef87dbf38ea40a20f06796e38466426460fad0
Merged revisions 63286 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r63286 | file | 2007-05-07 17:45:01 -0400 (Mon, 07 May 2007) | 10 lines

Merged revisions 63285 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r63285 | file | 2007-05-07 17:39:52 -0400 (Mon, 07 May 2007) | 2 lines

Properly handle what happens during a masquerade in relation to group counting. (issue #9657 reported by ramonpeek)

........

................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63287 65c4cc65-6c06-0410-ace0-fbb531ad65f3
include/asterisk/app.h
main/app.c
main/channel.c