From: Automerge script <automerge@asterisk.org>
Date: Thu, 6 Apr 2006 17:06:45 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.7-netsec~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=760352a196a4eefcd6f8828a1b98ec6734d1df01;p=thirdparty%2Fasterisk.git

automerge commit

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

diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c
index 9e7d3cc845..3904203630 100644
--- a/apps/app_directed_pickup.c
+++ b/apps/app_directed_pickup.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2005, Joshua Colp
  *
- * Joshua Colp <jcolp@asterlink.com>
+ * Joshua Colp <jcolp@digium.com>
  *
  * See http://www.asterisk.org for more information about
  * the Asterisk project. Please do not directly contact