From: Terry Wilson <twilson@digium.com>
Date: Fri, 21 Aug 2009 03:51:37 +0000 (+0000)
Subject: Oops, committed this first. Make the merged property happy
X-Git-Tag: 1.6.1.7-rc1~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e8dc1a7d12f12e33c810c5e5854e9b1c30abf79;p=thirdparty%2Fasterisk.git

Oops, committed this first. Make the merged property happy


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