GitHub PushEvent at 2014-03-11 14:57:54
Repository: CalZone
Actor: MPieter
Payload: {"shas":[["c9b6f5bd80b696dbb64444708902f72d06065611","870ec77a0027ed3d57abb1d3c953079c3e6990b2@dhcp-151-68.vub.ac.be","find course by courseID & select all enrolled courses from user","nicocarraggi",true],["0054dbea8b0a911d28d4c4ba7ac3094acb131e17","870ec77a0027ed3d57abb1d3c953079c3e6990b2@dhcp-151-68.vub.ac.be","Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev\n\nConflicts:\n\tJavaServer/calzone/src/main/java/com/vub/dao/EnrollmentDao.java","nicocarraggi",true],["038ead8132bb0ba5f91b3da679374a7fedfecc29","5108384de37eefb53744c1321c1c5ef10a292f0b@gmail.com","Merge pull request #75 from nicocarraggi/nicodev\n\nfind course by courseID & select all enrolled courses from user","MPieter",true]],"size":3,"ref":"refs/heads/master","head":"038ead8132bb0ba5f91b3da679374a7fedfecc29"}