Nova-Team/Nova-Server — pull request #23 by CreaturePhil (2014-03-27 02:14:37+00:00)
Title: General Update v2.2

Merging is not going to work. We got to start from scratch again.