GitHub PushEvent at 2014-12-01 13:28:27
Repository: FYS
Actor: hdylah
Payload: {"shas":[["1f1dd17e16229350f8a6548b72c5c12ea12e41a2","353319c82108d5cba098e8e7b3b933b3bd1290e3@181.207.109.145.hva.nl","Merge origin/master\n\nConflicts:\n\tBeta FYS/src/connectivity/QueryManager.java","dylanhoogeveen",true]],"size":1,"ref":"refs/heads/master","head":"1f1dd17e16229350f8a6548b72c5c12ea12e41a2"}