merge markster's usersconf branch with some slight changes
authorKevin P. Fleming <kpfleming@digium.com>
Sat, 16 Sep 2006 23:53:58 +0000 (23:53 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Sat, 16 Sep 2006 23:53:58 +0000 (23:53 +0000)
commitc2c4f86c729294a26ec9138f8f1e5288f89b01e6
tree1298da607ca8facdbaf23866e9294b57e39057d9
parente887127bf37a123175657e9fbacb5818118800c8
merge markster's usersconf branch with some slight changes

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
15 files changed:
apps/app_directory.c
apps/app_voicemail.c
channels/chan_iax2.c
channels/chan_sip.c
channels/chan_zap.c
configs/extensions.conf.sample
configs/users.conf.sample [new file with mode: 0644]
configs/voicemail.conf.sample
include/asterisk/config.h
include/asterisk/pbx.h
main/asterisk.c
main/config.c
main/manager.c
main/pbx.c
pbx/pbx_config.c