Merged revisions 67526 via svnmerge from
authorSteve Murphy <murf@digium.com>
Tue, 5 Jun 2007 22:04:22 +0000 (22:04 +0000)
committerSteve Murphy <murf@digium.com>
Tue, 5 Jun 2007 22:04:22 +0000 (22:04 +0000)
commit52efde5c65b50f97208f2b61e42f00f7efa3b0fb
treed55541d274887966c0d7d47f37068a603922ee77
parent7903eac38fdd4beca9f2b584a57b616a684b25ee
Merged revisions 67526 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r67526 | murf | 2007-06-05 15:30:18 -0600 (Tue, 05 Jun 2007) | 1 line

this fixes bug 9883, wherein macros were not allowing the includes construct. fixed and tested, looks OK. Now includes can serve as an adjunct to catch.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
pbx/Makefile
pbx/ael/ael.tab.c
pbx/ael/ael.y
pbx/pbx_ael.c
utils/Makefile