From: Sam Moore <matches@ucc.asn.au>
Date: Sat, 21 Sep 2013 17:26:51 +0000 (+0800)
Subject: Merge branch 'fix_hardwarecode'
X-Git-Url: https://git.ucc.asn.au/?p=matches%2FMCTX3420.git;a=commitdiff_plain;h=f5e2b07860f26bde42b9a9eb41ef68138ff2a379

Merge branch 'fix_hardwarecode'

Wait... it's letting me merge with no complains???
---

f5e2b07860f26bde42b9a9eb41ef68138ff2a379