Merge branch '0.7.x' into 0.8.x

author Sarven Capadisli <csarven@controlyourself.ca>

Wed, 8 Apr 2009 22:58:21 +0000 (22:58 +0000)

committer Sarven Capadisli <csarven@controlyourself.ca>

Wed, 8 Apr 2009 22:58:21 +0000 (22:58 +0000)
author Sarven Capadisli <csarven@controlyourself.ca>
Wed, 8 Apr 2009 22:58:21 +0000 (22:58 +0000)
committer Sarven Capadisli <csarven@controlyourself.ca>
Wed, 8 Apr 2009 22:58:21 +0000 (22:58 +0000)
diff --cc classes/Notice.php
Simple merge
diff --cc lib/util.php
Simple merge
author	Sarven Capadisli <csarven@controlyourself.ca>
	Wed, 8 Apr 2009 22:58:21 +0000 (22:58 +0000)
committer	Sarven Capadisli <csarven@controlyourself.ca>
	Wed, 8 Apr 2009 22:58:21 +0000 (22:58 +0000)
		1	2
classes/Notice.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history