Merge branch 'master' of git://gitorious.org/laconica/br3nda into review/master

author CiaranG <ciaran@ciarang.com>

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

committer CiaranG <ciaran@ciarang.com>

Wed, 8 Apr 2009 21:11:58 +0000 (22:11 +0100)
author CiaranG <ciaran@ciarang.com>
Wed, 8 Apr 2009 21:11:58 +0000 (22:11 +0100)
committer CiaranG <ciaran@ciarang.com>
Wed, 8 Apr 2009 21:11:58 +0000 (22:11 +0100)
diff --cc classes/Notice.php
Simple merge
diff --cc lib/util.php
Simple merge
author	CiaranG <ciaran@ciarang.com>
	Wed, 8 Apr 2009 21:11:58 +0000 (22:11 +0100)
committer	CiaranG <ciaran@ciarang.com>
	Wed, 8 Apr 2009 21:11:58 +0000 (22:11 +0100)
		1	2
classes/Notice.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history