From 41dcafb4f529981a125505ec82ac59ee1385a49d Mon Sep 17 00:00:00 2001
From: Andrew Bettison <andrew@servalproject.org>
Date: Tue, 3 Dec 2013 15:05:05 +1030
Subject: [PATCH] Add CONTRIBUTORS.md file, fix alternative links in README.md

---
 CONTRIBUTORS.md | 24 ++++++++++++++++++++++++
 README.md       | 17 ++++++++++-------
 2 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 CONTRIBUTORS.md

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
new file mode 100644
index 00000000..d6c7b857
--- /dev/null
+++ b/CONTRIBUTORS.md
@@ -0,0 +1,24 @@
+Serval DNA Contributors
+=======================
+[Serval Project][], December 2013
+
+The following individuals have contributed to the [Serval DNA][] software.  We
+apologise for any omissions.  If you know of a name that is missing, please
+contact us.
+
+Serval Project team
+-------------------
+ * Dr Paul Gardner-Stephen, Co-founder and Project Lead
+ * Jeremy Lakeman, Senior Software Engineer
+ * Andrew Bettison, Senior Software Engineer
+ * Daniel O'Connor, Senior Software Engineer
+
+Other contributors
+------------------
+ * Romain Vimont (®om)
+ * Dan Staples, Open Technology Institute
+ * Petter Reinholdtsen
+
+
+[Serval Project]: http://www.servalproject.org/
+[Serval DNA]: https://github.com/servalproject/serval-dna
diff --git a/README.md b/README.md
index 3adc90bc..d95fb675 100644
--- a/README.md
+++ b/README.md
@@ -88,15 +88,14 @@ Download, build and test
 ------------------------
 
 Instructions for downloading, building and testing Serval DNA are in
-[INSTALL.md](./INSTALL.md).  (If that link is does not work, try
-[INSTALL.md](/servalproject/serval-dna/blob/master/INSTALL.md).)
+[INSTALL.md](./INSTALL.md).
+([alternative link](/servalproject/serval-dna/blob/development/INSTALL.md))
 
 Configure
 ---------
 
-See [doc/Servald-Configuration](./doc/Servald-Configuration.md) (alternative
-link [doc/Servald-Configuration]
-(/servalproject/serval-dna/blob/master/doc/Servald-Configuration.md)).
+See [doc/Servald-Configuration](./doc/Servald-Configuration.md)
+([alternative link](/servalproject/serval-dna/blob/development/doc/Servald-Configuration.md)).
 
 More information
 ----------------
@@ -115,10 +114,14 @@ via a two-way [pipe][] called the *monitor interface*.
 For more documentation, see:
 
  * the [doc/](./doc/) directory
-   (alternative link [doc/](/servalproject/serval-dna/tree/master/doc/))
+   ([alternative link](/servalproject/serval-dna/tree/development/doc/))
 
  * the [Serval DNA][] page in the [Serval Project Wiki][]
 
+* [CONTRIBUTORS.md](./CONTRIBUTORS.md)
+  ([alternative link](/servalproject/serval-dna/blob/development/CONTRIBUTORS.md))
+  All individuals who have contributed to the software.
+
 [Serval Project]: http://www.servalproject.org/
 [Serval Project Wiki]: http://developer.servalproject.org/
 [Serval DNA]: http://developer.servalproject.org/dokuwiki/doku.php?id=content:servaldna:
@@ -129,7 +132,7 @@ For more documentation, see:
 [GNU C]: http://gcc.gnu.org/
 [daemon]: http://en.wikipedia.org/wiki/Daemon_(computing)
 [free software]: http://www.gnu.org/philosophy/free-sw.html
-[contributors]: /servalproject/serval-dna/blob/master/CONTRIBUTORS.md
+[contributors]: /servalproject/serval-dna/blob/development/CONTRIBUTORS.md
 [GitHub]: https://github.com/servalproject
 [GPL2]: http://www.gnu.org/licenses/gpl-2.0.html
 [individ]: http://developer.servalproject.org/files/serval_project_inc-individual.pdf