GitHub PushEvent at 2014-11-24 10:24:21
Repository: ptavi-p6
Actor: silviamaa
Payload: {"shas":[["85d3d3643411dc5d4cdc301ae45d602c88fbe05b","f1b8859cd699c70d899fc7f6a5e448a717c25f33@iota22.aulas.gsyc.es","INVITE hecho","silvia marin mateos",true],["f11a2514ea789a160e50ab50211ccb52baa5d9f4","f1b8859cd699c70d899fc7f6a5e448a717c25f33@iota22.aulas.gsyc.es","INVITE hecho","silvia marin mateos",true],["53804aeffdc57c02212674dc0d0524212d03d5b9","f1b8859cd699c70d899fc7f6a5e448a717c25f33@iota31.aulas.gsyc.es","terminado cliente","silvia marin mateos",true],["34910a90e2e6ac523d0bfca39b09d2aca168a15c","f1b8859cd699c70d899fc7f6a5e448a717c25f33@iota31.aulas.gsyc.es","terminado servidor","silvia marin mateos",true],["de5050e6d11dcb6ba7ab2dba9c5add397dce27c0","f1b8859cd699c70d899fc7f6a5e448a717c25f33@iota31.aulas.gsyc.es","terminado servidor","silvia marin mateos",true],["bb1878fb4cfe9914136f37a262a7cf12a57d9b5e","f1b8859cd699c70d899fc7f6a5e448a717c25f33@iota31.aulas.gsyc.es","Merge branch 'master' of https://github.com/silviamaa/ptavi-p6\n\nConflicts:\n\tclient.py\n\tserver.py","silvia marin mateos",true],["e6065f91cd4c73e09411376858894cc4438fac65","f1b8859cd699c70d899fc7f6a5e448a717c25f33@iota31.aulas.gsyc.es","cancion","silvia marin mateos",true],["ffba6d7cb1023dd7001a4cc6a6814281d8bdb02a","f1b8859cd699c70d899fc7f6a5e448a717c25f33@iota31.aulas.gsyc.es","programas terminados","silvia marin mateos",true]],"size":8,"ref":"refs/heads/master","head":"ffba6d7cb1023dd7001a4cc6a6814281d8bdb02a"}