Merged revisions 186445 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Fri, 3 Apr 2009 19:59:55 +0000 (19:59 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Fri, 3 Apr 2009 19:59:55 +0000 (19:59 +0000)
commita3c84f9575ac8c1b168bc4f02cf6e9ccd3b5d7f1
tree4aba03579cf7520a962c288e638c150142ab21d9
parent06061491ba647e9d7c9f5cd6bbf0e8c54e15688c
Merged revisions 186445 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r186445 | tilghman | 2009-04-03 14:56:48 -0500 (Fri, 03 Apr 2009) | 2 lines

  Found a conflict in the last commit, due to multiple targets
........

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