Merge pull request #454 from TShock/general-devel

Update TerrariaServer to match latest again
This commit is contained in:
Lucas Nicodemus 2012-05-25 23:18:32 -07:00
commit f7945278ec