Merge commit 'jeff-themovie/0.8.x-openidonly' into 0.8.x

author Craig Andrews <candrews@integralblue.com>

Mon, 10 Aug 2009 15:53:35 +0000 (11:53 -0400)

committer Craig Andrews <candrews@integralblue.com>

Mon, 10 Aug 2009 15:53:35 +0000 (11:53 -0400)
author Craig Andrews <candrews@integralblue.com>
Mon, 10 Aug 2009 15:53:35 +0000 (11:53 -0400)
committer Craig Andrews <candrews@integralblue.com>
Mon, 10 Aug 2009 15:53:35 +0000 (11:53 -0400)
diff --cc config.php.sample
Simple merge
diff --cc lib/common.php
Simple merge
author	Craig Andrews <candrews@integralblue.com>
	Mon, 10 Aug 2009 15:53:35 +0000 (11:53 -0400)
committer	Craig Andrews <candrews@integralblue.com>
	Mon, 10 Aug 2009 15:53:35 +0000 (11:53 -0400)
		1	2
config.php.sample	patch \|	diff1 \|	diff2 \|	blob \| history
lib/common.php	patch \|	diff1 \|	diff2 \|	blob \| history