GitHub PushEvent at 2014-05-07 20:23:11
Repository: mtop
Actor: carlisromero
Payload: {"shas":[["14c2805b95c370e67cd14f635a80565b5a124e0f","fa228705d1962f0b827ef1b0ef3d48b2dc068099@carlis-Satellite-M645","comit2","carlis",true],["5c6c4190ed18706d54e77ff474beaab7d85cbcd3","fa228705d1962f0b827ef1b0ef3d48b2dc068099@carlis-Satellite-M645","Merge origin/master\n\nConflicts:\n\tsrc/main/java/org/mtop/controller/ControladorPersona.java","carlis",true]],"size":2,"ref":"refs/heads/master","head":"5c6c4190ed18706d54e77ff474beaab7d85cbcd3"}