Merge branch '0.8.x' into 0.9.x

author Evan Prodromou <evan@controlyourself.ca>

Thu, 27 Aug 2009 14:56:19 +0000 (07:56 -0700)

committer Evan Prodromou <evan@controlyourself.ca>

Thu, 27 Aug 2009 14:56:19 +0000 (07:56 -0700)
author Evan Prodromou <evan@controlyourself.ca>
Thu, 27 Aug 2009 14:56:19 +0000 (07:56 -0700)
committer Evan Prodromou <evan@controlyourself.ca>
Thu, 27 Aug 2009 14:56:19 +0000 (07:56 -0700)
diff --cc install.php
Simple merge
diff --cc lib/common.php
Simple merge
diff --cc lib/util.php
Simple merge
author	Evan Prodromou <evan@controlyourself.ca>
	Thu, 27 Aug 2009 14:56:19 +0000 (07:56 -0700)
committer	Evan Prodromou <evan@controlyourself.ca>
	Thu, 27 Aug 2009 14:56:19 +0000 (07:56 -0700)
		1	2
install.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/common.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history