Merge branch 'tb_magic' of http://github.com/FlutterSprite/evennia into tb_magic

This commit is contained in:
BattleJenkins 2017-12-10 18:54:37 -08:00
commit a945c40ff6