CleverRaven/Cataclysm-DDA — pull request #2557 by Rivet-the-Zombie (2013-08-20 19:40:48+00:00)
Title: Merge pull request #2 from CleverRaven/master

Updating master