merging the zap_and_dahdi_trunk branch up to trunk
authorMark Michelson <mmichelson@digium.com>
Mon, 28 Jul 2008 16:00:19 +0000 (16:00 +0000)
committerMark Michelson <mmichelson@digium.com>
Mon, 28 Jul 2008 16:00:19 +0000 (16:00 +0000)
commit06d951f58588d6713a71d2aa689a07e2af70254e
treef54c744da738790027a3a283aca0ca09dec29679
parent4c372e41a2658e7f3bf8f2928dc761c0b1a78f25
merging the zap_and_dahdi_trunk branch up to trunk

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_chanspy.c
apps/app_dahdiscan.c
apps/app_meetme.c
main/asterisk.c