From 842655360963697e0050f27117a49fcc068a6d16 Mon Sep 17 00:00:00 2001
From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Thu, 18 Jun 2015 19:58:38 -0300
Subject: [PATCH] Move maintainers to a section in README.md

Move to README.md so it gains visibility and add more maintainers for
each board.
---
 MAINTAINERS.md | 11 -----------
 README.md      | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 11 deletions(-)
 delete mode 100644 MAINTAINERS.md

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
deleted file mode 100644
index 2996d9e673..0000000000
--- a/MAINTAINERS.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ardupilot maintainers
-
-To facilitate development we have a number of maintainers who have volunteered to coordinate development on subsections of the project.  When submitting pull requests please follow the conventions preferred by each maintainer.  See below
-
-* Plane mantainer @tridge.
-* Quads/Hex/etc... maintainer @rmackay9
-* Rover maintainer @tridge
-* LogAnalyzer maintainer @chapman
-* Anything else: @Craig3DRobotics
-
-When submitting pull requests, please include the subsystem (Plane, copter, VRBRAIN, etc... as the first part of the commit) and follow the rules listed in [CONTRIBUTING](CONTRIBUTING.md).
diff --git a/README.md b/README.md
index 13bef3875f..c963251551 100644
--- a/README.md
+++ b/README.md
@@ -43,3 +43,35 @@
 >>[Overview of license](http://dev.ardupilot.com/wiki/license-gplv3)
 
 >>[Full Text](https://github.com/diydrones/ardupilot/blob/master/COPYING.txt)
+
+### Maintainers ###
+>> Ardupilot is comprised of several parts, vehicles and boards. The list below
+>> contains the people that regularly contribute to the project and are responsible
+>> for reviewing patches on their specific area. See [CONTRIBUTING.md](CONTRIBUTING.md)
+>> for more information.
+>>
+>> - [Andrew Tridgell](https://github.com/tridge)
+>>   - ***Vehicle***: AntennaTracker, Plane
+>>   - ***Board***: APM1, APM2, Pixhawk
+>> - [Randy Mackay](https://github.com/rmackay9)
+>>   - ***Vehicle***: Copter
+>> - [Robert Lefebvre](https://github.com/R-Lefebvre)
+>>   - ***Vehicle***: TradHeli
+>> - [Grant Morphett](https://github.com/gmorph):
+>>   - ***Vehicle***: Rover
+>> - [Matthias Badaire](https://github.com/badzz)
+>>   - ***Subsystem***: FRSky
+>> - [Paul Riseborough](https://github.com/priseborough)
+>>   - ***Subsystem***: AP_NavEKF
+>> - [Lucas De Marchi](https://github.com/lucasdemarchi)
+>>   - ***Subsystem***: Linux
+>> - [Víctor Mayoral Vilches](https://github.com/vmayoral)
+>>   - ***Board***: PXF
+>> - [Mirko Denecke](https://github.com/mirkix)
+>>   - ***Board***: BBBmini
+>> - [Emlid](https://github.com/emlid)
+>>   - ***Board***: NavIO
+>> - [Emile Castelnuovo](https://github.com/emilecastelnuovo)
+>>   - ***Board***: VRBrain
+>> - [Mike McCauley](#)
+>>   - ***Board***: Flymaple