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/?a=commitdiff_plain;ds=sidebyside;h=a9bbebcd9a85982320208184570c0e0976fc2f43;p=matches%2FMCTX3420.git

Merge branch 'fix_hardwarecode'

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

a9bbebcd9a85982320208184570c0e0976fc2f43