Merge commit 'br3nda/0.8.x-pginstaller' into 0.8.x

author CiaranG <ciaran@ciarang.com>

Sun, 19 Jul 2009 07:08:39 +0000 (08:08 +0100)

committer CiaranG <ciaran@ciarang.com>

Sun, 19 Jul 2009 07:08:39 +0000 (08:08 +0100)
author CiaranG <ciaran@ciarang.com>
Sun, 19 Jul 2009 07:08:39 +0000 (08:08 +0100)
committer CiaranG <ciaran@ciarang.com>
Sun, 19 Jul 2009 07:08:39 +0000 (08:08 +0100)
diff --cc db/laconica_pg.sql
Simple merge
diff --cc install.php
Simple merge
author	CiaranG <ciaran@ciarang.com>
	Sun, 19 Jul 2009 07:08:39 +0000 (08:08 +0100)
committer	CiaranG <ciaran@ciarang.com>
	Sun, 19 Jul 2009 07:08:39 +0000 (08:08 +0100)
		1	2
db/laconica_pg.sql	patch \|	diff1 \|	diff2 \|	blob \| history
install.php	patch \|	diff1 \|	diff2 \|	blob \| history