From: Mark Michelson <mmichelson@digium.com>
Date: Mon, 24 Jun 2013 19:28:51 +0000 (+0000)
Subject: Remove stray properties from merge.
X-Git-Tag: 13.0.0-beta1~1623
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=463470bb6ea89dc102e5ebd0f9e72b182dbbf494;p=thirdparty%2Fasterisk.git

Remove stray properties from merge.



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