Merge branch 'sessionidparam' into 0.9.x

author Evan Prodromou <evan@status.net>

Mon, 11 Jan 2010 08:45:26 +0000 (00:45 -0800)

committer Evan Prodromou <evan@status.net>

Mon, 11 Jan 2010 08:45:26 +0000 (00:45 -0800)
author Evan Prodromou <evan@status.net>
Mon, 11 Jan 2010 08:45:26 +0000 (00:45 -0800)
committer Evan Prodromou <evan@status.net>
Mon, 11 Jan 2010 08:45:26 +0000 (00:45 -0800)
diff --cc actions/register.php
Simple merge
diff --cc lib/router.php
Simple merge
diff --cc lib/util.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Mon, 11 Jan 2010 08:45:26 +0000 (00:45 -0800)
committer	Evan Prodromou <evan@status.net>
	Mon, 11 Jan 2010 08:45:26 +0000 (00:45 -0800)
		1	2
actions/register.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/router.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history