Merged revisions 173066 via svnmerge from
authorTerry Wilson <twilson@digium.com>
Mon, 2 Feb 2009 23:57:25 +0000 (23:57 +0000)
committerTerry Wilson <twilson@digium.com>
Mon, 2 Feb 2009 23:57:25 +0000 (23:57 +0000)
commit34be09bf5cf2ca54c844e62b74c09fa0e7a582b2
tree29aa9f3a4613afa988d1f6973e996309c4a08c1d
parentc668cbfbfc400456a0420ed13d5b376b0a578e6a
Merged revisions 173066 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r173066 | twilson | 2009-02-02 17:48:06 -0600 (Mon, 02 Feb 2009) | 2 lines

  Fix a feature inheritance bug I added after code review
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@173067 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/features.c