GitHub PushEvent at 2014-11-17 19:26:35
Repository: urna_eletronica
Actor: MatheusMS01
Payload: {"shas":[["f84f640cfe4d0b3716952bee8cdbdc7848e8bb40","97beaaa396adad97608185ac9557419655c4f2ca@PC-Matheus","s","Matheus",true],["11d8f48eb6f2d7db3fa05d59e2f697a9a62c5ec5","97beaaa396adad97608185ac9557419655c4f2ca@PC-Matheus","Merge branch 'master' of\nhttps://github.com/bd-und-2014/urna_eletronica.git\n\nConflicts:\n\tsrc/br/unb/bd/core/ControleCandidato.java","Matheus",true]],"size":2,"ref":"refs/heads/master","head":"11d8f48eb6f2d7db3fa05d59e2f697a9a62c5ec5"}