GitHub PushEvent at 2014-07-11 01:56:58
Repository: focus-app
Actor: liudawei
Payload: {"shas":[["d4a228baa5dac97bd126c546b3fb29c79ec2d0ee","e9979839d73adc8ebe378f45a968339f5c4c7ba6@126.com","example","liudawei",true],["5ac1908a87f379585428a5bd8e65da2e2c2e46ad","e9979839d73adc8ebe378f45a968339f5c4c7ba6@126.com","Merge branch 'master' of github.com:liudawei/focus-app\n\nConflicts:\n\tmodule-app/module-app-web/pom.xml\n\tmodule-app/module-app-web/src/main/java/com/david/app/util/HttpUtil.java\n\tmodule-app/module-app-web/src/main/java/com/david/app/util/ThreadUtil.java\n\tmodule-app/module-app-web/src/test/java/com/david/app/test/Test.java\n\tmodule-app/module-app-web/src/test/java/com/david/app/test/TestHttpClient.java","liudawei",true]],"size":2,"ref":"refs/heads/master","head":"5ac1908a87f379585428a5bd8e65da2e2c2e46ad"}