GitHub PushEvent at 2014-07-09 08:09:01
Repository: ZJUMarket
Actor: starsdeep
Payload: {"shas":[["3281684c4f0433364f2d6997545323ddba665498","e8767c35071e0d9bd29bb9ea367c7fa18ef6ce4f","修复：xml 多了个框","starsdeep",true],["891ff3d7822736f9e0794a1f3751e7521177f1a6","e8767c35071e0d9bd29bb9ea367c7fa18ef6ce4f","Merge branch 'master' of https://github.com/starsdeep/ZJUMarket\n\nConflicts:\n\tjdsc/res/layout/main_buy.xml","starsdeep",true]],"size":2,"ref":"refs/heads/master","head":"891ff3d7822736f9e0794a1f3751e7521177f1a6"}