automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@16385 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_groupcount.c b/apps/app_groupcount.c
index aa848c2d5460d14bfb50158496d238174c8c3b3a..07c07835c954369675be98afdb14f5788562e2df 100644 (file)
--- a/apps/app_groupcount.c
+++ b/apps/app_groupcount.c
@@ -257,8 +257,8 @@ static char *group_count_descrip =
 "  Calculates the group count for the specified group, or uses\n"
 "the current channel's group if not specifed (and non-empty).\n"
 "Stores result in GROUPCOUNT. \n"
-"This application has been deprecated, please use the function\n"
-"GroupCount.\n";
+"Note: This application has been deprecated, please use the function\n"
+"GROUP_COUNT.\n";
 
 static char *group_set_descrip =
 "Usage: SetGroup(groupname[@category])\n"
@@ -284,8 +284,8 @@ static char *group_match_count_descrip =
 "  Calculates the group count for all groups that match the specified\n"
 "pattern. Uses standard regular expression matching (see regex(7)).\n"
 "Stores result in GROUPCOUNT.  Always returns 0.\n"
-"This application has been deprecated, please use the function\n"
-"GroupMatchCount.\n";
+"Note: This application has been deprecated, please use the function\n"
+"GROUP_MATCH_COUNT.\n";
 
 static char show_channels_usage[] = 
 "Usage: group show channels [pattern]\n"

diff --git a/res/res_features.c b/res/res_features.c
index 131d695ee05368f9e1f2df185d1e1c7855a83a5d..89260a4b06ea6e5c6a0a0fad33dee11dd77b3ed2 100644 (file)
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -1975,6 +1975,7 @@ static int load_config(void)
        parking_start = 701;
        parking_stop = 750;
        parkfindnext = 0;
+       adsipark = 0;
 
        transferdigittimeout = DEFAULT_TRANSFER_DIGIT_TIMEOUT;
        featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT;