From: Joshua Colp <jcolp@digium.com>
Date: Thu, 6 Apr 2006 17:01:47 +0000 (+0000)
Subject: Merged revisions 17905 via svnmerge from
X-Git-Tag: 1.4.0-beta1~2113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=17499717535e01fd468629f073446b407822420e;p=thirdparty%2Fasterisk.git

Merged revisions 17905 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r17905 | file | 2006-04-06 14:00:10 -0300 (Thu, 06 Apr 2006) | 2 lines

Update email address to my Digium one

........


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

diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c
index 632ac326dd..53e829f092 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