Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

2010-07-02 04:21:48 +01:00 · 2010-07-02 04:21:48 +01:00 · a4b7863ea1
parent 9e0b562c6e d58b32735d
commit a4b7863ea1
1 changed files with 1 additions and 0 deletions
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@ -95,6 +95,7 @@ what it is today.
 * Mic Bowman
 * Michelle Argus
 * Michael Cortez (The Flotsam Project, http://osflotsam.org/)
+* Micheil Merlin
 * Mike Osias (IBM)
 * Mike Pitman (IBM)
 * mikkopa/_someone - RealXtend