Merge from disorder.dev.

author Richard Kettlewell <rjk@greenend.org.uk>

Sun, 18 Oct 2009 21:54:18 +0000 (22:54 +0100)

committer Richard Kettlewell <rjk@greenend.org.uk>

Sun, 18 Oct 2009 21:54:18 +0000 (22:54 +0100)
author Richard Kettlewell <rjk@greenend.org.uk>
Sun, 18 Oct 2009 21:54:18 +0000 (22:54 +0100)
committer Richard Kettlewell <rjk@greenend.org.uk>
Sun, 18 Oct 2009 21:54:18 +0000 (22:54 +0100)
diff --cc disobedience/queue-generic.c
Simple merge
diff --cc disobedience/queue.c
Simple merge
diff --cc lib/eclient.c
Simple merge
diff --cc lib/trackdb.c
Simple merge
diff --cc server/server.c
Simple merge
author	Richard Kettlewell <rjk@greenend.org.uk>
	Sun, 18 Oct 2009 21:54:18 +0000 (22:54 +0100)
committer	Richard Kettlewell <rjk@greenend.org.uk>
	Sun, 18 Oct 2009 21:54:18 +0000 (22:54 +0100)
		1	2
disobedience/queue-generic.c	patch \|	diff1 \|	diff2 \|	blob \| history
disobedience/queue.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/eclient.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/trackdb.c	patch \|	diff1 \|	diff2 \|	blob \| history
server/server.c	patch \|	diff1 \|	diff2 \|	blob \| history