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

diff --git a/Roles.textile b/Roles.textile
index 38feb6a0de358b4f20cd9b42d5c7a66d528c2db5..31ce069869bb75697be6f0303f583c34199207ca 100644 (file)
--- 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