From 090cd16d681225e16127478b60a51d4a3adb3c30 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Mon, 3 Nov 2008 00:53:10 +0000
Subject: [PATCH] record revisions that were manually merged

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