GitHub PushEvent at 2014-10-26 17:32:26
Repository: vsys
Actor: if13b067
Payload: {"shas":[["d2adc66dc49f92f55519199618629b9481dfca7c","e7c06e3e62c00b04566697a3e25b203b5ff1dfef@technikum-wien.at","kleine anpassungen","Sebastian",false],["b37a468aca442e91013fab5cf1f939ccc2e0292a","e7c06e3e62c00b04566697a3e25b203b5ff1dfef@technikum-wien.at","angefangen","Sebastian",false],["e23a7a3e6bb60d45b670809532a283448e8d1100","e7c06e3e62c00b04566697a3e25b203b5ff1dfef@technikum-wien.at","Merge branch 'workingbranch'\n\nConflicts:\n\tserver_list.c","Sebastian",true]],"size":3,"ref":"refs/heads/master","head":"e23a7a3e6bb60d45b670809532a283448e8d1100"}