malarkey/Rock-Hammer — pull request #28 by simonpioli (2013-06-01 09:22:16+00:00)
Title: Fix Merge Conflict

A merge conflict was present in this file. I've assumed you want the version that was in the HEAD.