GitHub PushEvent at 2014-03-30 00:42:59
Repository: cs246
Actor: chrisplyn
Payload: {"shas":[["5d0a325e9172e045fc1f44e205da8f9f61a84cb3","58024a0dd5190562dbd84c4a1826db61b1719f21@uwaterloo.ca","new block.h cell.h","chrisplyn",true],["c0a28120b8863ee1c46a3438be9e494c1d041fc1","58024a0dd5190562dbd84c4a1826db61b1719f21@uwaterloo.ca","Merge branch 'master' of https://github.com/chrisplyn/cs246\n\nConflicts:\n\tblock.h","chrisplyn",true]],"size":2,"ref":"refs/heads/master","head":"c0a28120b8863ee1c46a3438be9e494c1d041fc1"}