From 97b3a1c5a49d7dd61b7edddbafc3b1b5ef302385 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Wed, 22 Mar 2006 20:06:03 +0000
Subject: [PATCH] use proper email address for merge failures

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