GitHub PushEvent at 2014-11-26 12:20:51
Repository: paysdk
Actor: pengshaokui
Payload: {"shas":[["1e8141ad1a4880dcd5415f508d6b8d045f3e7d0c","602cd68fb89c828dbdc7bd2b6d6a93d2d40a2627@qq.com","keys","pengsk",true],["c441d1c957617d0fe1ab30d30e317c0f095ec91b","602cd68fb89c828dbdc7bd2b6d6a93d2d40a2627@qq.com","Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tXYComPayMiddleWare/src/com/xy/xypay/activity/XYLoginActivity.java","pengsk",true],["cb314457fdf1745ed6514f0c9ccf569136daa472","602cd68fb89c828dbdc7bd2b6d6a93d2d40a2627@qq.com","keys","pengsk",true],["6b385e1b5baf1a534f82d8838e164df516c35002","602cd68fb89c828dbdc7bd2b6d6a93d2d40a2627@qq.com","Merge remote-tracking branch 'origin/master'","pengsk",true]],"size":4,"ref":"refs/heads/master","head":"6b385e1b5baf1a534f82d8838e164df516c35002"}