From: Sam Moore <matches@ucc.asn.au>
Date: Mon, 9 Apr 2012 02:32:45 +0000 (+0800)
Subject: Merge branch 'networking' of mussel.ucc.asn.au:progcomp2012
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=7c42b4b7e5ed6e423f0c023ad6e8a2aa47a4f081;p=progcomp2012.git

Merge branch 'networking' of mussel.ucc.asn.au:progcomp2012

Conflicts:
	agents/basic_java/Makefile

Stupid java AI broke everything
---

7c42b4b7e5ed6e423f0c023ad6e8a2aa47a4f081