aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-15 20:53:09 +0000
committerlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-15 20:53:09 +0000
commit15a488e559225215d9f5d77e24d358b422251cd4 (patch)
treeacd5e1c933580754a26d913b09c6d04dd1287b51 /contrib
parent37a85758260f5bdcf7665ad79aecfede0c33742f (diff)
Merged revisions 252534 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r252534 | lmadsen | 2010-03-15 15:52:32 -0500 (Mon, 15 Mar 2010) | 15 lines Merged revisions 252533 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r252533 | lmadsen | 2010-03-15 15:48:56 -0500 (Mon, 15 Mar 2010) | 7 lines Update extensions.ael file to not overlap extensions.conf. Updated the extensions.ael file so the global variables don't overlap those that we have in extensions.conf (sample files). This way unexpected things won't happed hopefully if both pbx_ael and res_config are loaded. (closes issue #17035) Reported by: pprindeville ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@252535 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions