From: Kevin P. Fleming <kpfleming@digium.com>
Date: Wed, 26 Nov 2008 20:35:14 +0000 (+0000)
Subject: Blocked revisions 159571 via svnmerge
X-Git-Tag: 1.6.2.0-beta1~763
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f62ffebedfc70d7fe40069e14a37e9c0ad2322f9;p=thirdparty%2Fasterisk.git

Blocked revisions 159571 via svnmerge

........
  r159571 | kpfleming | 2008-11-26 14:21:04 -0600 (Wed, 26 Nov 2008) | 2 lines

  rename these files so as to avoid conflicts when users update their working copies and have unversioned files already in place
........


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