From b48cda78d398e833f9db3f7c587ec670720a82c8 Mon Sep 17 00:00:00 2001
From: Sean Bright <sean@malleable.com>
Date: Mon, 20 Apr 2009 21:21:49 +0000
Subject: [PATCH] Remove trunk-merge property (trunk-merged is still here)

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