From dd65a6d76ea7d92685a7bb30ed2a5488d10e5fae Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@mad.scientist.com>
Date: Fri, 22 Jun 2007 14:25:27 +0000
Subject: [PATCH] MAINTAINERS: Updating all the maintainers files

Original commit message from CVS:
* MAINTAINERS:
Updating all the maintainers files
---
 ChangeLog   | 5 +++++
 MAINTAINERS | 4 ++--
 common      | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8f503ec..0244abc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-22  Jan Schmidt  <thaytan@noraisin.net>
+
+	* MAINTAINERS:
+	Updating all the maintainers files
+
 2007-06-21  Stefan Kost  <ensonic@users.sf.net>
 
 	* tests/examples/seek/seek.c: (update_scale), (play_cb), (stop_cb),
diff --git a/MAINTAINERS b/MAINTAINERS
index 325bd24..a9f98ce 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2,8 +2,8 @@ GStreamer is currently maintained by the consensus of a number
 of people, including, but not limited to:
 
   David Schleef <ds@schleef.org>
-  Benjamin Otte <in7y118@public.uni-hamburg.de>
-  Ronald Bultje <rbultje@ronald.bitfreak.net>
+  Jan Schmidt <thaytan@noraisin.net>
+  Wim Taymans <wim@fluendo.com>
   Thomas Vander Stichele <thomas@apestaart.org>
 
 Maintainer-related issues should be addressed to:
diff --git a/common b/common
index 6cb0000..14c5a68 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 6cb0000a5a30d4fc580a06489106a637fca024c4
+Subproject commit 14c5a68981278f642e4ca5fd5ca08554fc78b348
-- 
2.7.4