Merged revisions 372338,372341,372358 via svnmerge from 
file:///srv/subversion/repos/asterisk/branches/10

................
  r372338 | kmoore | 2012-09-05 13:30:49 -0500 (Wed, 05 Sep 2012) | 13 lines
  
  Ensure counts generated in manager_show_dialplan_helper are correct
  
  When manager_show_dialplan_helper was written, the counter increment
  for the total number of contexts was placed with the extensions
  increment instead of in the enclosing loop.  This function should
  now generate correct context counts.
  
  (closes issue AST-970)
  Reported-by: John Bigelow
  ........
  
  Merged revisions 372337 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................
  r372341 | alecdavis | 2012-09-05 13:43:12 -0500 (Wed, 05 Sep 2012) | 7 lines
  
  dsp.c: in ast_mf_detect_init incorrectly sets goertzel samples to 160, should be MF_GSIZE
  
  Related https://reviewboard.asterisk.org/r/2097/
  ........
  
  Merged revisions 372339 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................
  r372358 | kmoore | 2012-09-05 14:22:08 -0500 (Wed, 05 Sep 2012) | 13 lines
  
  Correct documentation for ModuleLoad AMI action
  
  The documentation incorrectly listed 'rtp' as a reloadable subsystem
  and left out many other reloadable subsystems. It is now also
  documented that subsystems may only be reloaded, not loaded or
  unloaded.
  
  (closes issue AST-977)
  Reported-by: John Bigelow
  ........
  
  Merged revisions 372354 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................


git-svn-id: http://svn.asterisk.org/svn/asterisk/branches/10-digiumphones@372370 f38db490-d61c-443f-a65b-d21fe96a405b
Merged revisions 372372 via svnmerge from 
file:///srv/subversion/repos/asterisk/branches/10

........
  r372372 | rmudgett | 2012-09-05 14:42:17 -0500 (Wed, 05 Sep 2012) | 1 line
  
  Fix compile error.
........


git-svn-id: http://svn.asterisk.org/svn/asterisk/branches/10-digiumphones@372389 f38db490-d61c-443f-a65b-d21fe96a405b
Merged revisions 372391 via svnmerge from 
file:///srv/subversion/repos/asterisk/branches/10

................
  r372391 | mjordan | 2012-09-05 19:56:47 -0500 (Wed, 05 Sep 2012) | 24 lines
  
  Allow configured numbers for FollowMe to be greater than 90 characters
  
  When parsing a 'number' defined in followme.conf, FollowMe previously parsed
  the number in the configuration file into a buffer with a length of 90
  characters.  This can artificially limit some parallel dial scenarios.  This
  patch allows for numbers of any length to be defined in the configuration
  file.
  
  Note that Clod Patry originally wrote a patch to fix this problem and received
  a Ship It! on the JIRA issue.  The patch originally expanded the buffer to 256
  characters.  Instead, the patch being committed duplicates the string in the
  config file on the stack before parsing it for consumption by the application.
  
  (closes issue ASTERISK-16879)
  Reported by: Clod Patry
  Tested by: mjordan
  patches:
    followme_no_limit.diff uploaded by Clod Patry (license #5138)
  
  Slightly modified for this commit.
  ........
  
  Merged revisions 372390 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................


git-svn-id: http://svn.asterisk.org/svn/asterisk/branches/10-digiumphones@372416 f38db490-d61c-443f-a65b-d21fe96a405b