GitHub PushEvent at 2014-06-27 02:35:48
Repository: fuxin_android
Actor: lifang
Payload: {"shas":[["d2225b5ba4efb9a6e00909646e2a6ba812bf2941","3b617270dab3055dde7a958c0de55ae5aaac58f3@qq.com","zxn","zxn",true],["46dda3fe3ef60eee1a8c042adc014411aef7a850","3b617270dab3055dde7a958c0de55ae5aaac58f3@qq.com","Merge branch 'master' of github.com:lifang/fuxin_android\n\nConflicts:\n\tproject.properties\n\tsrc/com/fuwu/mobileim/util/DBHelper.java","zxn",true]],"size":2,"ref":"refs/heads/master","head":"46dda3fe3ef60eee1a8c042adc014411aef7a850"}