Merge branch 'refactor_sacrifices'
authorCorin Buchanan-Howland <corin@buchananhowland.net>
Mon, 27 Oct 2014 20:28:36 +0000 (16:28 -0400)
committerCorin Buchanan-Howland <corin@buchananhowland.net>
Mon, 27 Oct 2014 20:28:36 +0000 (16:28 -0400)
commit40b34e3653d4f518ee57b02d0f1f468b663e89b2
tree9b83b7dc85ef1659b60ea18e40245af033a9204b
parenta0504c57e029030ee7d9ca49cc0fa839b5562700
parentd1d74d769861e8f7e43f37f5c938d289546c9b40
Merge branch 'refactor_sacrifices'