GitHub PushEvent at 2014-05-23 02:57:51
Repository: trustcloudier
Actor: fadedlilac
Payload: {"shas":[["c52cfc678b7cad3e1bb490a1953e1257f97747de","4eed2c734288c282131ee30135c17c3eb6ef82ec@ecm-csse2122-x.uniwa.uwa.edu.au","frogs","fadedlilac",true],["037960efffe46db3cae57ee6d12b0228ae57aff4","4eed2c734288c282131ee30135c17c3eb6ef82ec@ecm-csse2122-x.uniwa.uwa.edu.au","more frogs","fadedlilac",true],["be79ec63cb210aa62437fd07dfe7c7aca4e20ce6","4eed2c734288c282131ee30135c17c3eb6ef82ec@ecm-csse2122-x.uniwa.uwa.edu.au","Merge branch 'master' of https://github.com/sethaurus/trustcloudier\n\nConflicts:\n\tClientNew.class\n\tClientNew.java\n\tServer.class\n\tServer.java","fadedlilac",true],["ae4710bcfe22d5d62c9333facbbf7d49da7efada","4eed2c734288c282131ee30135c17c3eb6ef82ec@ecm-csse2122-x.uniwa.uwa.edu.au","Merge branch 'master' of https://github.com/sethaurus/trustcloudier\n\nConflicts:\n\tClientNew.class\n\tClientNew.java\n\tServer.class\n\tServer.java","fadedlilac",true],["0eb9e9ddfef7c2932da73cb361f9bedcc04d3be1","4eed2c734288c282131ee30135c17c3eb6ef82ec@ecm-csse2122-x.uniwa.uwa.edu.au","ok","fadedlilac",true],["650ae48ab431d7c3ef32bfd442df811f6516b2c6","4eed2c734288c282131ee30135c17c3eb6ef82ec@ecm-csse2122-x.uniwa.uwa.edu.au","Merge branch 'master' of https://github.com/sethaurus/trustcloudier","fadedlilac",true]],"size":6,"ref":"refs/heads/master","head":"650ae48ab431d7c3ef32bfd442df811f6516b2c6"}