Merged revisions 139764 via svnmerge from
authorSteve Murphy <murf@digium.com>
Mon, 25 Aug 2008 15:54:18 +0000 (15:54 +0000)
committerSteve Murphy <murf@digium.com>
Mon, 25 Aug 2008 15:54:18 +0000 (15:54 +0000)
commitea898dc6c3290e6dcfd879f6aed0bec646937c1b
tree56fcbe95204642eae4693f8afc2b476a54dacbb0
parent8be98abf795f63314944c114205e092176d8331a
Merged revisions 139764 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139764 | murf | 2008-08-25 09:33:14 -0600 (Mon, 25 Aug 2008) | 9 lines

This patch reverts the changes made via 139347, and 139635, as users
are seeing adverse difference.

I will un-close 13251.

Back to the drawing board/ concept/ beginning/ whatever!

........

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