Merge branch '0.7.x' into 0.8.x

author Sarven Capadisli <csarven@controlyourself.ca>

Wed, 8 Apr 2009 22:55:13 +0000 (22:55 +0000)

committer Sarven Capadisli <csarven@controlyourself.ca>

Wed, 8 Apr 2009 22:55:13 +0000 (22:55 +0000)
author Sarven Capadisli <csarven@controlyourself.ca>
Wed, 8 Apr 2009 22:55:13 +0000 (22:55 +0000)
committer Sarven Capadisli <csarven@controlyourself.ca>
Wed, 8 Apr 2009 22:55:13 +0000 (22:55 +0000)
diff --cc README
Simple merge
diff --cc lib/action.php
Simple merge
diff --cc lib/twitter.php
Simple merge
author	Sarven Capadisli <csarven@controlyourself.ca>
	Wed, 8 Apr 2009 22:55:13 +0000 (22:55 +0000)
committer	Sarven Capadisli <csarven@controlyourself.ca>
	Wed, 8 Apr 2009 22:55:13 +0000 (22:55 +0000)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
lib/action.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/twitter.php	patch \|	diff1 \|	diff2 \|	blob \| history