From: Jeremy Tan <jeremy@jx.tan.fake>
Date: Mon, 9 Sep 2013 06:32:39 +0000 (+0800)
Subject: Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=30279eaa8f8de4250df8cc0fa47c5febf83e56cf;hp=30279eaa8f8de4250df8cc0fa47c5febf83e56cf;p=matches%2FMCTX3420.git

Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

Conflicts:
	server/sensor.c
---