From: Sam Moore Date: Fri, 29 Mar 2013 04:32:06 +0000 (+0800) Subject: Merge branch 'master' of git.ucc.asn.au:progcomp2013 X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;ds=sidebyside;h=2f1d1b63179c8fce4c2e3ac8aaefbbfff3d0d5ca;hp=-c;p=progcomp2013.git Merge branch 'master' of git.ucc.asn.au:progcomp2013 How do git work? --- 2f1d1b63179c8fce4c2e3ac8aaefbbfff3d0d5ca