Merge branch '0.7.x' into 0.8.x

author Evan Prodromou <evan@controlyourself.ca>

Thu, 26 Feb 2009 21:22:51 +0000 (13:22 -0800)

committer Evan Prodromou <evan@controlyourself.ca>

Thu, 26 Feb 2009 21:22:51 +0000 (13:22 -0800)
author Evan Prodromou <evan@controlyourself.ca>
Thu, 26 Feb 2009 21:22:51 +0000 (13:22 -0800)
committer Evan Prodromou <evan@controlyourself.ca>
Thu, 26 Feb 2009 21:22:51 +0000 (13:22 -0800)
diff --cc README
Simple merge
diff --cc db/laconica.sql
Simple merge
author	Evan Prodromou <evan@controlyourself.ca>
	Thu, 26 Feb 2009 21:22:51 +0000 (13:22 -0800)
committer	Evan Prodromou <evan@controlyourself.ca>
	Thu, 26 Feb 2009 21:22:51 +0000 (13:22 -0800)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
db/laconica.sql	patch \|	diff1 \|	diff2 \|	blob \| history