Merge commit 'jrollins/master'

[monkeysphere.git] / COPYING

diff --git a/COPYING b/COPYING
index c920a0e78e56d4262e2efeeaf0c7927631115251..36b1d0830bae7192573a4a3e47c2c929ed10f039 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -8,6 +8,8 @@ It is free software, developed by:
   Micah Anderson <micah@riseup.net>
   Matthew Goins <mjgoins@openflows.com>
   Mike Castleman <mlcastle@mlcastle.net>
+  Elliot Winard <enw@caveteen.com>
+  Greg Lyle <greg@stealthisemail.com>
 
 MonkeySphere is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of