GitHub PushEvent at 2014-10-22 17:39:42
Repository: PyQt-SQL
Actor: JoelLongRoad
Payload: {"shas":[["b637a6175db16c5a553634d3b0a6d4a297e7c62b","3b3cb560a5031ab128341e8143e68922b5ec80c7@longroad.ac.uk","_pycache","Joel Butcher",true],["c0818f031faf4b5cfe978e392cde429395d1b701","3b3cb560a5031ab128341e8143e68922b5ec80c7@longroad.ac.uk","Merge branch 'master' of https://github.com/JoelLongRoad/PyQt-SQL\n\nConflicts:\n\t__pycache__/DisplayWidget.cpython-34.pyc\n\t__pycache__/SQLController.cpython-34.pyc","Joel Butcher",true]],"size":2,"ref":"refs/heads/master","head":"c0818f031faf4b5cfe978e392cde429395d1b701"}