clean up wrong merged stuff
authorStefan Schmidt <sst@sil.at>
Wed, 7 Sep 2011 14:47:03 +0000 (14:47 +0000)
committerStefan Schmidt <sst@sil.at>
Wed, 7 Sep 2011 14:47:03 +0000 (14:47 +0000)
commit40f505c00979f3a871a20f75ca9bb08ca10ab314
tree38af427e1d878d0178de404cbd875cf76ae0a511
parent334401e57d6cd9bbc3f7b6d98119defa8786a617
clean up wrong merged stuff

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