undoing 360785 due to merging mistake
authorJonathan Rose <jrose@digium.com>
Thu, 29 Mar 2012 19:59:30 +0000 (19:59 +0000)
committerJonathan Rose <jrose@digium.com>
Thu, 29 Mar 2012 19:59:30 +0000 (19:59 +0000)
commitd501c2ea2d56ece966b6615799dd7b66198176dd
tree33ad80dfb8a5751b7d76e748621055083315251d
parentbf994f0e04696ba11ce0ec81df7880d61ef9c779
undoing 360785 due to merging mistake

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@360786 65c4cc65-6c06-0410-ace0-fbb531ad65f3
CHANGES
apps/app_mixmonitor.c
configs/logger.conf.sample
include/asterisk/bridging.h
include/asterisk/logger.h
main/dial.c
main/features.c
main/logger.c
main/pbx.c