From: Jason Parker <jparker@digium.com>
Date: Fri, 1 Dec 2006 20:24:32 +0000 (+0000)
Subject: erm, hmm...I typod a merge...that went...strangely
X-Git-Tag: 1.4.0-beta4~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93eb47fdbe256c6141c4de019f5e42fd4d226259;p=thirdparty%2Fasterisk.git

erm, hmm...I typod a merge...that went...strangely


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