Andrew McMillan 4f444d8bfa Resolve merge conflicts.
Conflicts:

	docs/website/inc/page-header.php
	docs/website/installation.php
2007-12-07 09:23:35 +13:00
..
2007-12-07 09:23:35 +13:00
2006-11-25 17:32:47 +13:00
2007-12-07 09:23:35 +13:00