]> git.ipfire.org Git - thirdparty/asterisk.git/commit
automerge commit
authorAutomerge script <automerge@asterisk.org>
Mon, 1 May 2006 21:05:01 +0000 (21:05 +0000)
committerAutomerge script <automerge@asterisk.org>
Mon, 1 May 2006 21:05:01 +0000 (21:05 +0000)
commit622352f2c984e30d0fbb1a6b797868e79cc5c96f
tree0e64a13bcccf56a3612e24ed42caba3143dcda0c
parent1a02e1b9c14769988dae62f71f483916d8c517d7
automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@24049 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_externalivr.c
apps/app_festival.c
apps/app_ices.c
apps/app_mp3.c
apps/app_nbscat.c
apps/app_zapras.c
asterisk.c
include/asterisk/options.h
res/res_musiconhold.c