Merge remote-tracking branch 'origin/0.10'

[platform/upstream/gstreamer.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 99d3500..e27f34a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,14 +1,11 @@
 GStreamer is currently maintained by the consensus of a number
 of people, including, but not limited to:
 
- Wim Taymans <wim@fluendo.com>
+ Jan Schmidt <thaytan@noraisin.net>
+ Wim Taymans <wim.taymans@gmail.com>
  David Schleef <ds@schleef.org>
- Benjamin Otte <in7y118@public.uni-hamburg.de>
- Ronald Bultje <rbultje@ronald.bitfreak.net>
- Thomas Vander Stichele <thomas@fluendo.com>
+ Tim-Philipp Müller <tim centricular net>
 
 Maintainer-related issues should be addressed to:
 
   gstreamer-devel@lists.sourceforge.net
-
-