GitHub PushEvent at 2014-04-11 22:21:17
Repository: shuttle_meteor
Actor: jamesgibson14
Payload: {"shas":[["9e55437eaad9881e1b840ae3c76b715a1600d1e6","f65fea2b1e30fdb90b87074e8dd8f890bb141312@hotmail.com","added gitignore","James Gibson",true],["7705e93399f515ec6f00985cdb868049065d0a29","f65fea2b1e30fdb90b87074e8dd8f890bb141312@hotmail.com","Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\t.meteor/packages\n\tpackages/.gitignore\n\tsmart.lock","James Gibson",true]],"size":2,"ref":"refs/heads/master","head":"7705e93399f515ec6f00985cdb868049065d0a29"}