GitHub PushEvent at 2014-06-07 14:55:10
Repository: GestionDonaciones
Actor: maichel90
Payload: {"shas":[["c9267b643141744ef6e785f703e4f9fb0ac621d1","45bb287c3d37cdec98c70e1360fe2d896307dc51@outlook.com","agregando clientes web services","Alejandro Rodriguez",true],["0781cf44b58fa0d5767bef9100d182b0a625eeb0","45bb287c3d37cdec98c70e1360fe2d896307dc51@outlook.com","Merge branch 'master' of https://github.com/maichel90/GestionDonaciones\n\nConflicts:\n\tWebContent/WEB-INF/faces-config.xml\n\tWebContent/pages/crearDonante.xhtml\n\tWebContent/pages/menu.xhtml\n\tWebContent/pages/modificarDonante.xhtml\n\tWebContent/pages/subirDonantes.xhtml\n\tsrc/co/themafia/entities/Persona.java\n\tsrc/co/themafia/entities/Tipopersona.java","Alejandro Rodriguez",true],["99487c0b549a1bca23f5704fbfdb1392bf1d3085","45bb287c3d37cdec98c70e1360fe2d896307dc51@outlook.com","comit cliente web service","Alejandro Rodriguez",true],["82aa77a32add7ada08ded3b45ee17bbcdd4a3677","45bb287c3d37cdec98c70e1360fe2d896307dc51@outlook.com","Merge branch 'master' of https://github.com/maichel90/GestionDonaciones\n\nConflicts:\n\tsrc/co/themafia/entities/Persona.java","Alejandro Rodriguez",true]],"size":4,"ref":"refs/heads/master","head":"82aa77a32add7ada08ded3b45ee17bbcdd4a3677"}