Merged revisions 166953 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Wed, 31 Dec 2008 19:34:28 +0000 (19:34 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Wed, 31 Dec 2008 19:34:28 +0000 (19:34 +0000)
commit7cb7920e1977d66d885060e5710bbcc43b2f8e11
treea5aeb12b438bd4337493728bd4317ec66fa4849c
parentc5bc0386f52b108f69bd7abb34bc8d0cb0a5ab88
Merged revisions 166953 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r166953 | tilghman | 2008-12-31 13:20:35 -0600 (Wed, 31 Dec 2008) | 5 lines

  Also inherit the musiconhold class.
  (Closes #14153)
  Reported by: Jerry Geis, via the users list.
  Patch by: me (license 14)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@166954 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_local.c
main/ast_expr2.c
main/ast_expr2.h