CleverRaven/Cataclysm-DDA — pull request #4669 by Rivet-the-Zombie (2013-11-25 03:31:03+00:00)
Title: Adds warhammer and battlaxe.

No conflicts this time around.