From 82ac4969865b76251d7cf459a16ac36b262a6b9b Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Thu, 20 Dec 2012 21:26:27 +0000
Subject: [PATCH] Add branch-1.8-merged property to allow direct merging from
 v1.8

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