From: Kevin P. Fleming <kpfleming@digium.com>
Date: Wed, 22 Mar 2006 20:06:03 +0000 (+0000)
Subject: use proper email address for merge failures
X-Git-Tag: 1.2.6-netsec~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97b3a1c5a49d7dd61b7edddbafc3b1b5ef302385;p=thirdparty%2Fasterisk.git

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
---