From 1faccbf91fa7cfef89f27c45eaea35599133b327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Loeuillet?= <gstreamer@leroutier.net>
Date: Sat, 11 Dec 2004 13:42:02 +0000
Subject: [PATCH] put the same mail for Zaheer Merali everywhere

Original commit message from CVS:
put the same mail for Zaheer Merali everywhere
---
 AUTHORS   | 2 +-
 ChangeLog | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 1cf3b79e8d..2208818b5b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,7 +3,7 @@ Matt Howell <mhowell@users.sourceforge.net>
 Brent Bradburn <bbradburn@users.sourceforge.net>
 Wim Taymans <wim.taymans@chello.be>
 Richard Boulton <richard@tartarus.org>
-Zaheer Merali <zaheer@grid9.net>
+Zaheer Abbas Merali <zaheerabbas at merali dot org>
   - thread synchronization rework
 David I. Lehn <dlehn@users.sourceforge.net>
   - debian packaging
diff --git a/ChangeLog b/ChangeLog
index 006f697d17..fa7d1e9bc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1544,7 +1544,7 @@
 	* docs/manual/links-api.xml: 
           fixes for out of date info, incorrect info and grammar
 
-2004-07-15  Zaheer Abbas Merali  <zaheerabbas at merali dot>
+2004-07-15  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
 	* docs/manual/pads.xml:
 	* docs/manual/pads-api.xml: grammar fix
@@ -1623,7 +1623,7 @@
 	* docs/manual/motivation.xml:
 	Bonobo is no longer "emerging" and added sentence regarding tcp plugins
 
-2004-07-15  Zaheer Abbas Merali  <zaheerabbas at merali.org>
+2004-07-15  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
 	* docs/manual/motivation.xml: Fix spelling
 
@@ -2194,7 +2194,7 @@
 	* libs/gst/bytestream/filepad.h:
 	  add 2 new functions
 
-2004-06-22  Zaheer Abbas Merali  <zaheerabbas at merali.org>
+2004-06-22  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
 	* docs/gst/gstreamer-sections.txt:
 	remove from docs, the define that Benjamin removed from gstelement.h