Merge "show features" (bug #3515)
authorMark Spencer <markster@digium.com>
Sun, 6 Feb 2005 23:36:35 +0000 (23:36 +0000)
committerMark Spencer <markster@digium.com>
Sun, 6 Feb 2005 23:36:35 +0000 (23:36 +0000)
commit88a49f727b87cbe930684c3189ec255890c8dbdb
treefb2fc38e4f3813e6f960edd4d9188d176d20afe5
parent9ec6b2a3589eb05bfcd46539927d8707b24d0980
Merge "show features" (bug #3515)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4971 65c4cc65-6c06-0410-ace0-fbb531ad65f3
res/res_features.c