Merge branch 'schema-x' of /Users/brion/pages/mublog into schema-x

author Brion Vibber <brion@pobox.com>

Fri, 8 Oct 2010 23:38:18 +0000 (16:38 -0700)

committer Brion Vibber <brion@pobox.com>

Fri, 8 Oct 2010 23:38:18 +0000 (16:38 -0700)
author Brion Vibber <brion@pobox.com>
Fri, 8 Oct 2010 23:38:18 +0000 (16:38 -0700)
committer Brion Vibber <brion@pobox.com>
Fri, 8 Oct 2010 23:38:18 +0000 (16:38 -0700)
diff --cc lib/mysqlschema.php
Simple merge
diff --cc lib/pgsqlschema.php
Simple merge
diff --cc lib/schema.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Fri, 8 Oct 2010 23:38:18 +0000 (16:38 -0700)
committer	Brion Vibber <brion@pobox.com>
	Fri, 8 Oct 2010 23:38:18 +0000 (16:38 -0700)
		1	2
lib/mysqlschema.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pgsqlschema.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/schema.php	patch \|	diff1 \|	diff2 \|	blob \| history