From: Jeff Peeler <jpeeler@digium.com>
Date: Fri, 11 Dec 2009 23:30:00 +0000 (+0000)
Subject: forgot the merge props for 234426
X-Git-Tag: 1.6.1.13-rc1~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31dc6ddf43b5a91b2ffb0131cc6572d79e4f2947;p=thirdparty%2Fasterisk.git

forgot the merge props for 234426

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