Merge branch '0.7.x' into 0.8.x

author Sarven Capadisli <csarven@csarven-laptop.(none)>

Fri, 8 May 2009 18:17:07 +0000 (14:17 -0400)

committer Sarven Capadisli <csarven@csarven-laptop.(none)>

Fri, 8 May 2009 18:17:07 +0000 (14:17 -0400)
author Sarven Capadisli <csarven@csarven-laptop.(none)>
Fri, 8 May 2009 18:17:07 +0000 (14:17 -0400)
committer Sarven Capadisli <csarven@csarven-laptop.(none)>
Fri, 8 May 2009 18:17:07 +0000 (14:17 -0400)
diff --cc actions/twittersettings.php
Simple merge
diff --cc classes/Notice.php
Simple merge
diff --cc db/notice_source.sql
Simple merge
author	Sarven Capadisli <csarven@csarven-laptop.(none)>
	Fri, 8 May 2009 18:17:07 +0000 (14:17 -0400)
committer	Sarven Capadisli <csarven@csarven-laptop.(none)>
	Fri, 8 May 2009 18:17:07 +0000 (14:17 -0400)
		1	2
actions/twittersettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
classes/Notice.php	patch \|	diff1 \|	diff2 \|	blob \| history
db/notice_source.sql	patch \|	diff1 \|	diff2 \|	blob \| history