Merge branch 'master' into 0.8.x

author Evan Prodromou <evan@controlyourself.ca>

Thu, 23 Jul 2009 21:45:21 +0000 (14:45 -0700)

committer Evan Prodromou <evan@controlyourself.ca>

Thu, 23 Jul 2009 21:45:21 +0000 (14:45 -0700)
author Evan Prodromou <evan@controlyourself.ca>
Thu, 23 Jul 2009 21:45:21 +0000 (14:45 -0700)
committer Evan Prodromou <evan@controlyourself.ca>
Thu, 23 Jul 2009 21:45:21 +0000 (14:45 -0700)
diff --cc classes/Fave.php
Simple merge
diff --cc classes/Notice.php
Simple merge
diff --cc scripts/twitterstatusfetcher.php
Simple merge
author	Evan Prodromou <evan@controlyourself.ca>
	Thu, 23 Jul 2009 21:45:21 +0000 (14:45 -0700)
committer	Evan Prodromou <evan@controlyourself.ca>
	Thu, 23 Jul 2009 21:45:21 +0000 (14:45 -0700)
		1	2
classes/Fave.php	patch \|	diff1 \|	diff2 \|	blob \| history
classes/Notice.php	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/twitterstatusfetcher.php	patch \|	diff1 \|	diff2 \|	blob \| history