Merged revisions 338085 via svnmerge from
authorPaul Belanger <paul.belanger@polybeacon.com>
Tue, 27 Sep 2011 20:15:30 +0000 (20:15 +0000)
committerPaul Belanger <paul.belanger@polybeacon.com>
Tue, 27 Sep 2011 20:15:30 +0000 (20:15 +0000)
commitc19baf655eb87571d7d41bac3785a273744398b5
tree3b7a30039ab6fff8e27a68b84ea6b911a4b7caf3
parent6e0f7be7c919bc29f2e3c62c594f1a94d31757a3
Merged revisions 338085 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r338085 | pabelanger | 2011-09-27 16:13:14 -0400 (Tue, 27 Sep 2011) | 9 lines

  Merged revisions 338084 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r338084 | pabelanger | 2011-09-27 16:10:13 -0400 (Tue, 27 Sep 2011) | 2 lines

    Upgrade app_macro to core
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338086 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_macro.c