Merge remote-tracking branch 'upstream/master'

author Richard Beales <rich@richbeales.net>

Mon, 18 Mar 2013 07:32:01 +0000 (07:32 +0000)

committer Richard Beales <rich@richbeales.net>

Mon, 18 Mar 2013 07:32:01 +0000 (07:32 +0000)
author Richard Beales <rich@richbeales.net>
Mon, 18 Mar 2013 07:32:01 +0000 (07:32 +0000)
committer Richard Beales <rich@richbeales.net>
Mon, 18 Mar 2013 07:32:01 +0000 (07:32 +0000)
diff --cc index.php
Simple merge
diff --cc prefs.php
Simple merge
author	Richard Beales <rich@richbeales.net>
	Mon, 18 Mar 2013 07:32:01 +0000 (07:32 +0000)
committer	Richard Beales <rich@richbeales.net>
	Mon, 18 Mar 2013 07:32:01 +0000 (07:32 +0000)
		1	2
index.php	patch \|	diff1 \|	diff2 \|	blob \| history
prefs.php	patch \|	diff1 \|	diff2 \|	blob \| history