Merged revisions 294207 via svnmerge from
authorTerry Wilson <twilson@digium.com>
Mon, 8 Nov 2010 19:59:39 +0000 (19:59 +0000)
committerTerry Wilson <twilson@digium.com>
Mon, 8 Nov 2010 19:59:39 +0000 (19:59 +0000)
commitaa0f407b8bfdfa7e28edcf6489faee02d191dc0e
treeda283574c6338a46ea1f4f224cf1fb93a84026b5
parent18553bb80491592ceadcfc9479e4501837dc3bb6
Merged revisions 294207 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r294207 | twilson | 2010-11-08 13:56:10 -0600 (Mon, 08 Nov 2010) | 2 lines

  Set a default waittime, and make sure to convert it to milliseconds
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@294208 65c4cc65-6c06-0410-ace0-fbb531ad65f3
configs/calendar.conf.sample
res/res_calendar.c