GitHub PushEvent at 2014-01-19 18:39:51
Repository: proyecto
Actor: Guillemv98
Payload: {"shas":[["b93eedef6fedc486f7036b84ab2c69efa1fd60a3","49387d7daf34e57547414f999094ee6336f786af@gmail.com","Merge branch 'master' of https://github.com/streamtube/proyecto\n\nConflicts:\n\trecursos/css/estilo.css","GuillemV98",true],["809add6ad73258da4b158b919efb0b54c7d5320c","49387d7daf34e57547414f999094ee6336f786af@gmail.com","Merge remote-tracking branch 'origin/master'","GuillemV98",true]],"size":2,"ref":"refs/heads/master","head":"809add6ad73258da4b158b919efb0b54c7d5320c"}