Merge branch '0.8.x' into invite-enabled

author Jeffery To <jeffery.to@gmail.com>

Tue, 23 Jun 2009 17:09:31 +0000 (01:09 +0800)

committer Jeffery To <jeffery.to@gmail.com>

Tue, 23 Jun 2009 17:09:31 +0000 (01:09 +0800)
author Jeffery To <jeffery.to@gmail.com>
Tue, 23 Jun 2009 17:09:31 +0000 (01:09 +0800)
committer Jeffery To <jeffery.to@gmail.com>
Tue, 23 Jun 2009 17:09:31 +0000 (01:09 +0800)
diff --cc README
Simple merge
diff --cc actions/invite.php
Simple merge
diff --cc config.php.sample
Simple merge
diff --cc lib/common.php
Simple merge
author	Jeffery To <jeffery.to@gmail.com>
	Tue, 23 Jun 2009 17:09:31 +0000 (01:09 +0800)
committer	Jeffery To <jeffery.to@gmail.com>
	Tue, 23 Jun 2009 17:09:31 +0000 (01:09 +0800)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
actions/invite.php	patch \|	diff1 \|	diff2 \|	blob \| history
config.php.sample	patch \|	diff1 \|	diff2 \|	blob \| history
lib/common.php	patch \|	diff1 \|	diff2 \|	blob \| history