Merge branch 'protogen'

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

Sun, 7 Aug 2011 16:45:36 +0000 (17:45 +0100)

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

Sun, 7 Aug 2011 16:45:36 +0000 (17:45 +0100)
author Richard Kettlewell <rjk@terraraq.org.uk>
Sun, 7 Aug 2011 16:45:36 +0000 (17:45 +0100)
committer Richard Kettlewell <rjk@terraraq.org.uk>
Sun, 7 Aug 2011 16:45:36 +0000 (17:45 +0100)
diff --cc cgi/disorder-cgi.h
Simple merge
diff --cc clients/disorder.c
Simple merge
diff --cc disobedience/playlists.c
Simple merge
diff --cc disobedience/properties.c
Simple merge
author	Richard Kettlewell <rjk@terraraq.org.uk>
	Sun, 7 Aug 2011 16:45:36 +0000 (17:45 +0100)
committer	Richard Kettlewell <rjk@terraraq.org.uk>
	Sun, 7 Aug 2011 16:45:36 +0000 (17:45 +0100)
		1	2
cgi/disorder-cgi.h	patch \|	diff1 \|	diff2 \|	blob \| history
clients/disorder.c	patch \|	diff1 \|	diff2 \|	blob \| history
disobedience/playlists.c	patch \|	diff1 \|	diff2 \|	blob \| history
disobedience/properties.c	patch \|	diff1 \|	diff2 \|	blob \| history