Merged revisions 331644 via svnmerge from
authorJonathan Rose <jrose@digium.com>
Fri, 12 Aug 2011 18:03:29 +0000 (18:03 +0000)
committerJonathan Rose <jrose@digium.com>
Fri, 12 Aug 2011 18:03:29 +0000 (18:03 +0000)
commit39fe851e7961357f7f86f3d7f117f4c2e20dd646
tree44afda8c1e237230d913aad5028799015f4c53a4
parent452f198609673ba60687f425bdd43cfb9e04d2ec
Merged revisions 331644 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331644 | jrose | 2011-08-12 11:18:57 -0500 (Fri, 12 Aug 2011) | 9 lines

  Merged revisions 331635 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r331635 | jrose | 2011-08-12 10:49:17 -0500 (Fri, 12 Aug 2011) | 1 line

    Fixes 32bit compilation warnings brought on by 331634 in app_dial and app_meetme
  ........
................

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