GitHub PushEvent at 2014-04-30 17:25:48
Repository: webapplication
Actor: koningj006
Payload: {"shas":[["9c70c6e2e500c070f8d25199ff8bfb0d2affef1f","c3fd34a2b584843eddab2fe66f58a961312e1984@hva.nl","Merge origin/develop into develop\n\nConflicts:\n\tweb/WEB-INF/view/project.jsp","koningj006-hva",true],["26679f7d94349f89b87e38f4e1e9c3236179a16e","c3fd34a2b584843eddab2fe66f58a961312e1984@hva.nl","Merge origin/develop into develop\n\nConflicts:\n\tweb/WEB-INF/view/project.jsp","koningj006-hva",true]],"size":2,"ref":"refs/heads/develop","head":"26679f7d94349f89b87e38f4e1e9c3236179a16e"}