]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
use proper email address for merge failures
authorKevin P. Fleming <kpfleming@digium.com>
Wed, 22 Mar 2006 20:06:03 +0000 (20:06 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Wed, 22 Mar 2006 20:06:03 +0000 (20:06 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@14182 65c4cc65-6c06-0410-ace0-fbb531ad65f3


No differences found