Merge branch 'master' of login.chiark.greenend.org.uk:things/Trains/trains

author Ian Jackson <ian@liberator.relativity.greenend.org.uk>

Mon, 3 Jan 2011 21:06:25 +0000 (21:06 +0000)

committer Ian Jackson <ian@liberator.relativity.greenend.org.uk>

Mon, 3 Jan 2011 21:06:25 +0000 (21:06 +0000)
author Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Mon, 3 Jan 2011 21:06:25 +0000 (21:06 +0000)
committer Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Mon, 3 Jan 2011 21:06:25 +0000 (21:06 +0000)
diff --cc hostside/Makefile
Simple merge
diff --cc hostside/measure-speeds
Simple merge
author	Ian Jackson <ian@liberator.relativity.greenend.org.uk>
	Mon, 3 Jan 2011 21:06:25 +0000 (21:06 +0000)
committer	Ian Jackson <ian@liberator.relativity.greenend.org.uk>
	Mon, 3 Jan 2011 21:06:25 +0000 (21:06 +0000)
		1	2
hostside/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
hostside/measure-speeds	patch \|	diff1 \|	diff2 \|	blob \| history