ianestrachan/Cataclysm-DDA — pull request #4 by atomicdryad (2013-09-29 08:12:35+00:00)
Title: Pr to fix pr broken by pr i merged sorry

merged a json init change a few minutes ago