Bad merge fix
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 19 Apr 2010 19:23:41 +0000 (19:23 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 19 Apr 2010 19:23:41 +0000 (19:23 +0000)
commit990ccdd05f17eb845fdd255568d44eac3833bf14
tree78beef8974ef73a31629ad9f651a1440cd3a19f1
parent38d77bde7579e8df90ea21aa6df503c9b329dd32
Bad merge fix

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