Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk

author Evan Prodromou <git@evanprodromou.name>

Fri, 23 Jan 2009 08:01:06 +0000 (09:01 +0100)

committer Evan Prodromou <git@evanprodromou.name>

Fri, 23 Jan 2009 08:01:06 +0000 (09:01 +0100)
author Evan Prodromou <git@evanprodromou.name>
Fri, 23 Jan 2009 08:01:06 +0000 (09:01 +0100)
committer Evan Prodromou <git@evanprodromou.name>
Fri, 23 Jan 2009 08:01:06 +0000 (09:01 +0100)
diff --cc htaccess.sample
Simple merge
diff --cc lib/util.php
Simple merge
author	Evan Prodromou <git@evanprodromou.name>
	Fri, 23 Jan 2009 08:01:06 +0000 (09:01 +0100)
committer	Evan Prodromou <git@evanprodromou.name>
	Fri, 23 Jan 2009 08:01:06 +0000 (09:01 +0100)
		1	2
htaccess.sample	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history