From b0dd14a0de16ba4f6d36adeeb4fdfb718604fb55 Mon Sep 17 00:00:00 2001
From: Paul Barker <paul@paulbarker.me.uk>
Date: Thu, 05 Dec 2013 07:43:48 -0500
Subject: AUTHORS: Update and merge CONTRIBUTORS file

The AUTHORS file is converted to Markdown format so that it can be easily
rendered into other formats like HTML as required.

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
diff --git a/AUTHORS b/AUTHORS
index e7ce307..45d455b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,8 +1,49 @@
+% Opkg Authors and Maintainers
+
+## Current Maintainer
+
+  * Paul Barker <paul@paulbarker.me.uk>
+
+## Previous Authors & Maintainers
+
 Opkg:
-	* Thomas Wood <thomas@openedhand.com>
-	* Tick Chen <ticktock35@gmail.com>
-	* Graham Gower <graham.gower@gmail.com>
+
+  * Thomas Wood <thomas@openedhand.com>
+  * Tick Chen <ticktock35@gmail.com>
+  * Graham Gower <graham.gower@gmail.com>
+
 Ipkg:
-	* Pierluigi Frullani <pigi@frumar.it>
-	* Carl Worth <cworth@handhelds.org>
-	* Steve Ayer <steven.ayer@compaq.com>
+
+  * Pierluigi Frullani <pigi@frumar.it>
+  * Carl Worth <cworth@handhelds.org>
+  * Steve Ayer <steven.ayer@compaq.com>
+
+## Additional Contributors
+
+The following people have submitted changes which have been applied to the core:
+
+  * Christopher Hall <hsw@openmoko.com>
+  * EdorFaus <edorfaus@gmail.com>
+  * Graham Gower <graham.gower@gmail.com>
+  * Krzysztof Kotlenga <pocek@users.sf.net>
+  * Per Hansen <spamhans@yahoo.de>
+  * Mike Westerhof <mwester@dls.net>
+  * Antonio Ospite <ospite@studenti.unina.it>
+  * Koen Kooi <koen@beagleboard.org>
+  * Claudio Mignanti <claudyus84@gmail.com>
+  * Florian Boor <florian.boor@kernelconcepts.de>
+  * Camille Moncelier <moncelier@devlife.org>
+  * Jim Huang <jserv.tw@gmail.com>
+  * John L. Chmielewski <jlcster@gmail.com>
+
+We don't have your name / email:
+
+  * Gilles Doffe
+  * cconroy
+  * chgros
+  * Kosmaty
+  * manitu
+  * pblack88@gmail.com
+
+And anyone else who has sent patches or bug reports. If your name isn't on this
+list, please forgive us and send an email to a maintainer.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
deleted file mode 100644
index d85411a..0000000
--- a/CONTRIBUTORS
+++ /dev/null
@@ -1,31 +0,0 @@
-=== Contributors ===
-
-The following people have submitted changes which have been applied to the
-core:
-
-Christopher Hall <hsw@openmoko.com>
-EdorFaus <edorfaus@gmail.com>
-Graham Gower <graham.gower@gmail.com>
-Krzysztof Kotlenga <pocek@users.sf.net>:
-Per Hansen <spamhans@yahoo.de>
-Mike Westerhof <mwester@dls.net>
-Antonio Ospite <ospite@studenti.unina.it>
-Koen Kooi <koen@beagleboard.org >
-Claudio Mignanti <claudyus84@gmail.com>
-Florian Boor <florian.boor@kernelconcepts.de>
-Camille Moncelier <moncelier@devlife.org>
-Jim Huang <jserv.tw@gmail.com>
-John L. Chmielewski <jlcster@gmail.com>
-
-
-== We don't have your name / email ==
-Gilles Doffe
-cconroy
-chgros
-Kosmaty
-manitu
-pblack88@gmail.com
-
-and anyone else who has sent patches or bug reports. If your name isn't on this
-list, please forgive us and send an email to a maintainer 
-The project owners/committers is here: http://code.google.com/p/opkg/ 
--
cgit v0.9.1