From 0f62fa6e476b0d8f64df03f21df359cb7bab6d3e Mon Sep 17 00:00:00 2001
From: "David M. Lee" <dlee@digium.com>
Date: Thu, 13 Dec 2012 21:15:44 +0000
Subject: [PATCH] Fixed svn merge property breakage from r377986

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