From: merlijn <mhofstra@gmail.com>
Date: Sat, 3 Apr 2010 03:00:00 +0000 (+0000)
Subject: (Commit created by redmine exporter script from page "Roles" version 7)
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0fbcbf70604bbf78c755fad77e7f57396c227e44;p=xonotic%2Fxonotic.wiki.git

(Commit created by redmine exporter script from page "Roles" version 7)
---

diff --git a/Roles.textile b/Roles.textile
index 38feb6a..31ce069 100644
--- a/Roles.textile
+++ b/Roles.textile
@@ -13,6 +13,7 @@ Green Marine
 Kadaverjack
 lda17h
 mand1nga
+merlijn
 Samual
 Spaceman
 tZork
@@ -35,6 +36,7 @@ Dokujisan
 -z-
 C.Brutail
 mand1nga
+merlijn
 tZork
 
 h2. Moderators
@@ -109,6 +111,7 @@ jayvee
 john galt
 jscinoz
 Kadaverjack
+merlijn
 Willis
 
 h2. Server Admins