Merge branch 'master' into dev

This commit is contained in:
Axel Uhl committed 2012-03-22 11:21:24 +01:00
commit 84887a0742
10 files changed
+50 -19

No files matched your search

@@ -16,5 +16,10 @@ axel: axel,spectator,moderator,administrator
frank: frank,spectator,moderator,administrator
lennart: lennart,spectator,moderator,administrator
marcus: marcus,spectator,moderator,administrator
milan: milan,spectator,moderator,administrator
nils: nils,spectator,moderator,administrator
stefan: stefan,spectator,moderator,administrator
ricardo: ricardo,spectator,moderator,administrator
christopher: christopher,spectator,moderator,administrator
spectator: spectator,spectator
moderator: moderator,moderator