Merge branch 'general-devel-1.1' of github.com:TShock/TShock into general-devel-1.1

This commit is contained in:
Lucas Nicodemus 2011-12-01 23:24:23 -07:00
commit b45f65cc68