Merge pull request #229 from HRogge/for-15.05

[feed/routing.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 7c4d791c864b28071ed94cdb31248cadcbf05855..4d8f5e253a144805ae86842bb42c6c67fb6420ae 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4,8 +4,22 @@
 # |_______||   __|_____|__|__||________||__|  |____|
 #          |__| W I R E L E S S   F R E E D O M
 #
-# People listed here are managing the OpenWrt telephony feed. Use
-# alphabetical order when updating the list.
+# People listed here are managing the OpenWrt routing feed,
+# use alphabetical order when updating the list.
 
+Axel "axn" Neumann <neumann@cgws.de>
+Baptiste Jonglez <bjonglez@illyse.org>
+Bastian Bittorf <bittorf@bluebottle.com>
+Corinna "Elektra" Aichele <onelektra@gmx.net>
+Gabriel Kerneis <gabriel@kerneis.info>
+Gui Iribarren <gui@altermundi.net>
 Jo-Philipp Wich <jow@openwrt.org>
 Luka Perkov <luka@openwrt.org>
+Marek Lindner <mareklindner@neomailbox.ch>
+Moritz Warning <moritzwarning@web.de>
+Nicolás Echániz <nicoechaniz@altermundi.net>
+Pau Escrich <pau@dabax.net>
+Saverio Proto <zioproto@gmail.com>
+Simon Wunderlich <sw@simonwunderlich.de>
+Steven Barth <cyrus@openwrt.org>
+Vasilis "acinonyx" Tsiligiannis <acinonyx@openwrt.gr>