GitHub PushEvent at 2014-05-24 19:16:04
Repository: webapplication
Actor: koningj006
Payload: {"shas":[["21313266b6d88e1d1c39628a2dedd830a749c195","c3fd34a2b584843eddab2fe66f58a961312e1984@hva.nl","Merge origin/develop into develop\n\nConflicts:\n\tsrc/java/controller/ProjectController.java","koningj006-hva",true]],"size":1,"ref":"refs/heads/develop","head":"21313266b6d88e1d1c39628a2dedd830a749c195"}