GitHub PushEvent at 2014-05-13 21:54:16
Repository: seguridad_software
Actor: Gloix
Payload: {"shas":[["142235c25b6a88cd80b62256ad57f8ae717165e9","5832bc088de38321a01556e0c587107410533fe2@gmail.com","Have no idea what i'm doing","Ian Yon",false],["42ae26a135fdcdf244cde0a48589425908116046","5832bc088de38321a01556e0c587107410533fe2@gmail.com","Merge branch 'ian' into gonzalo\n\nConflicts:\n\tAndroidManifest.xml\n\tGroups Organizer.iml\n\tres/layout/event_config.xml\n\tres/layout/event_row.xml\n\tres/layout/events_list.xml\n\tres/layout/main.xml\n\tres/layout/pager_view.xml\n\tres/layout/register.xml\n\tsrc/cl/uchile/fcfm/dcc/groupsorganizer/connection/Conexion.java\n\tsrc/cl/uchile/fcfm/dcc/groupsorganizer/connection/ConexionPost.java\n\tsrc/cl/uchile/fcfm/dcc/groupsorganizer/connection/ConexionTask.java\n\tsrc/cl/uchile/fcfm/dcc/groupsorganizer/connection/Request.java\n\tsrc/cl/uchile/fcfm/dcc/groupsorganizer/connection/TareaAsincrona.java\n\tsrc/cl/uchile/fcfm/dcc/groupsorganizer/connection/TaskCallbacks.java\n\tsrc/cl/uchile/fcfm/dcc/groupsorganizer/connection/WorkerFragment.java\n\tsrc/cl/uchile/fcfm/dcc/groupsorganizer/connection/exception/CustomException.java\n\tsrc/cl/uchile/fcfm/dcc/groupsorganizer/connection/exception/ServerErrorException.java\n\tsrc/cl/uchile/fcfm/dcc/groupsorganizer/connection/tasks/LoginConnection.java\n\tsrc/cl/uchile/fcfm/dcc/groupsorganizer/ui/CustomFragmentActivity.java\n\tsrc/cl/uchile/fcfm/dcc/groupsorganizer/ui/Login.java","Ian Yon",false]],"size":2,"ref":"refs/heads/master","head":"42ae26a135fdcdf244cde0a48589425908116046"}