From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 23 Jun 2010 18:41:18 +0000 (+0000)
Subject: Recorded merge of revisions 272147 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2789
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cd0856d0027e20b8e80800f10ad12fd013e8c14;p=thirdparty%2Fasterisk.git

Recorded merge of revisions 272147 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r272147 | tilghman | 2010-06-23 13:40:28 -0500 (Wed, 23 Jun 2010) | 5 lines

  Backport part of revision 136715 to fix callerid in voicemail text files (IMAP only).

  (closes issue #16945)
   Reported by: mneuhauser
........


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