Merge branch 'master' into dev

This commit is contained in:
Axel Uhl committed 2012-05-05 01:10:03 +02:00
commit 32b11dc56c
35 files changed
+554 -65

No files matched your search

@@ -19,7 +19,7 @@ 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
riccardo: riccardo,spectator,moderator,administrator
christopher: christopher,spectator,moderator,administrator
spectator: spectator,spectator
moderator: moderator,moderator