Merge branch '0.7.x' into 0.8.x

author Sarven Capadisli <csarven@controlyourself.ca>

Fri, 29 May 2009 00:10:23 +0000 (00:10 +0000)

committer Sarven Capadisli <csarven@controlyourself.ca>

Fri, 29 May 2009 00:10:23 +0000 (00:10 +0000)
author Sarven Capadisli <csarven@controlyourself.ca>
Fri, 29 May 2009 00:10:23 +0000 (00:10 +0000)
committer Sarven Capadisli <csarven@controlyourself.ca>
Fri, 29 May 2009 00:10:23 +0000 (00:10 +0000)
diff --cc README
Simple merge
diff --cc db/notice_source.sql
Simple merge
diff --cc lib/common.php
Simple merge
author	Sarven Capadisli <csarven@controlyourself.ca>
	Fri, 29 May 2009 00:10:23 +0000 (00:10 +0000)
committer	Sarven Capadisli <csarven@controlyourself.ca>
	Fri, 29 May 2009 00:10:23 +0000 (00:10 +0000)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
db/notice_source.sql	patch \|	diff1 \|	diff2 \|	blob \| history
lib/common.php	patch \|	diff1 \|	diff2 \|	blob \| history