Merge pull request #521 from fermionic/20121101-updates

author fermionic <fermion@gmx.com>

Fri, 2 Nov 2012 19:26:49 +0000 (12:26 -0700)

committer fermionic <fermion@gmx.com>

Fri, 2 Nov 2012 19:26:49 +0000 (12:26 -0700)
author fermionic <fermion@gmx.com>
Fri, 2 Nov 2012 19:26:49 +0000 (12:26 -0700)
committer fermionic <fermion@gmx.com>
Fri, 2 Nov 2012 19:26:49 +0000 (12:26 -0700)
diff --cc boot.php
Simple merge
diff --cc mod/photos.php
Simple merge
author	fermionic <fermion@gmx.com>
	Fri, 2 Nov 2012 19:26:49 +0000 (12:26 -0700)
committer	fermionic <fermion@gmx.com>
	Fri, 2 Nov 2012 19:26:49 +0000 (12:26 -0700)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/photos.php	patch \|	diff1 \|	diff2 \|	blob \| history